Merge branch 'dev' into major

* dev: (38 commits)
  Update documentation
  Rid ct_telnet of doc build warnings
  Create temporary fix for problem with parallel test cases
  Update primary bootstrap
  Correct "Missing Suites" link
  Add documentation on timetraps and start flags
  Add missing tests for timetrap handling and fix remaining errors
  Solve problem with ct_init/end_per_group being counted as test cases
  Fix errors in test suites
  Fix invalid call to undefined function
  Fix problem with test_server_ctrl creating invalid conf test
  Improve info in CT framework log
  Update vsn.mk for common_test and test_server
  Enhance logging performance
  Change order of include files
  Add link to last executed test suite on index page
  Fix problem with location value when init config func calls help func
  Fix crash when CTHook init fails
  Correct error in test suite
  Fix error with incorrect notification after end_per_testcase craches
  ...

Conflicts:
	bootstrap/bin/start.boot
	bootstrap/bin/start_clean.boot
	bootstrap/lib/compiler/ebin/beam_asm.beam
	bootstrap/lib/compiler/ebin/beam_disasm.beam
	bootstrap/lib/compiler/ebin/compile.beam
	bootstrap/lib/compiler/ebin/sys_pre_expand.beam
	bootstrap/lib/kernel/ebin/code.beam
	bootstrap/lib/kernel/ebin/code_server.beam
	bootstrap/lib/kernel/ebin/hipe_unified_loader.beam
	bootstrap/lib/kernel/ebin/inet.beam
	bootstrap/lib/kernel/ebin/inet_config.beam
	bootstrap/lib/kernel/ebin/inet_dns.beam
	bootstrap/lib/stdlib/ebin/beam_lib.beam
	bootstrap/lib/stdlib/ebin/dets.beam
	bootstrap/lib/stdlib/ebin/erl_compile.beam
	bootstrap/lib/stdlib/ebin/erl_internal.beam
	bootstrap/lib/stdlib/ebin/erl_scan.beam
	bootstrap/lib/stdlib/ebin/erl_tar.beam
	bootstrap/lib/stdlib/ebin/io_lib_fread.beam
	bootstrap/lib/stdlib/ebin/otp_internal.beam
	bootstrap/lib/stdlib/ebin/sofs.beam
	bootstrap/lib/stdlib/ebin/supervisor.beam
	bootstrap/lib/stdlib/ebin/zip.beam
	lib/common_test/src/ct.erl
	lib/common_test/src/ct_run.erl
	lib/common_test/test/ct_error_SUITE.erl
	lib/common_test/test/ct_repeat_1_SUITE.erl
	lib/common_test/test/ct_skip_SUITE.erl
	lib/test_server/src/test_server.erl

1 files changed, 38 insertions, 2 deletions

diff --git a/lib/common_test/doc/src/run_test_chapter.xml b/lib/common_test/doc/src/run_test_chapter.xml
index 816aa5b1eb..57059f0ba2 100644
--- a/lib/common_test/doc/src/run_test_chapter.xml
+++ b/lib/common_test/doc/src/run_test_chapter.xml
@@ -128,6 +128,15 @@
     <p><c>$ ct_run -suite $SYS1_TEST/setup_SUITE -case start stop</c></p>
     <p><c>$ ct_run -suite $SYS1_TEST/setup_SUITE -group installation -case start stop</c></p>
     
+    <p>It is also possible to combine the <c>dir</c>, <c>suite</c> and <c>group/case</c> flags. E.g, to run
+    <c>x_SUITE</c> and <c>y_SUITE</c> in directory <c>testdir</c>:</p>
+
+    <p><c>$ ct_run -dir ./testdir -suite x_SUITE y_SUITE</c></p>
+
+    <p>This has the same effect as calling:</p>
+
+    <p><c>$ ct_run -suite ./testdir/x_SUITE ./testdir/y_SUITE</c></p>
+
     <p>Other flags that may be used with <c>ct_run</c>:</p>
     <list>
       <item><c><![CDATA[-logdir <dir>]]></c>, specifies where the HTML log files are to be written.</item>
@@ -167,6 +176,8 @@
       <item><c><![CDATA[-decrypt_file <key_file>]]></c>, points out a file containing a decryption key for 
         <seealso marker="config_file_chapter#encrypted_config_files">encrypted configuration files</seealso>.</item>
       <item><c><![CDATA[-basic_html]]></c>, switches off html enhancements that might not be compatible with older browsers.</item>
+      <item><c><![CDATA[-logopts <opts>]]></c>, makes it possible to modify aspects of the logging behaviour, see
+        <seealso marker="run_test_chapter#logopts">Log options</seealso> below.</item>
     </list>
 
     <note><p>Directories passed to Common Test may have either relative or absolute paths.</p></note>
@@ -324,8 +335,9 @@
        are to be executed by Common Test, and those functions only. If
        the step option <c>config</c> is specified, breakpoints will 
        also be initially set on the configuration functions in the suite, i.e.
-       <c>init_per_suite/1</c>, <c>end_per_suite/1</c>, <c>init_per_testcase/2</c> 
-       and <c>end_per_testcase/2</c>.</p>
+       <c>init_per_suite/1</c>, <c>end_per_suite/1</c>,
+       <c>init_per_group/2</c>, <c>end_per_group/2</c>,
+       <c>init_per_testcase/2</c> and <c>end_per_testcase/2</c>.</p>
     <p>Common Test enables the Debugger auto attach feature, which means
        that for every new interpreted test case function that starts to execute, 
        a new trace window will automatically pop up. (This is because each test 
@@ -652,6 +664,30 @@
 	to follow test progress simply by refreshing pages in the HTML browser.
 	Statistics totals are not presented until a test is complete however.</p>
 
+	<section>
+	  <marker id="logopts"></marker>
+	  <title>Log options</title>
+	  <p>With the <c>logopts</c> start flag, it's possible to specify
+	  options that modify some aspects of the logging behaviour.
+	  Currently, the following options are available:</p>
+	  <list>
+	    <item><c>no_src</c></item>
+	    <item><c>no_nl</c></item>
+	  </list>
+	  <p>With <c>no_src</c>, the html version of the test suite source
+	  code will not be generated during the test run (and consequently
+	  not be available in the log file system).</p>
+	  <p>With <c>no_nl</c>, Common Test will not add a newline character
+	  (\n) to the end of an output string that it receives from a call to e.g.
+	  <c>io:format/2</c>, and which it prints to the test case log.</p>
+	  <p>For example, if a test is started with:</p>
+	  <p><c>$ ct_run -suite my_SUITE -logopts no_src</c></p>
+	  <p>then printouts during the test made by successive calls to <c>io:format("x")</c>,
+	  will appear in the test case log as:</p>
+	  <p><c>xxx</c></p>
+	  <p>instead of each <c>x</c> printed on a new line, which is the default behaviour.</p>
+	</section>
+
       </section>
   
       <section>