List:Commits« Previous MessageNext Message »
From:bjorn.munch Date:April 18 2011 11:55am
Subject:svn commit - mysqldoc@oter02: r25912 - trunk/mysqltest-2.0
View as plain text  
Author: bm136801
Date: 2011-04-18 13:55:44 +0200 (Mon, 18 Apr 2011)
New Revision: 25912

Log:
Updates for 5.5.11

Modified:
   trunk/mysqltest-2.0/programs.xml
   trunk/mysqltest-2.0/unit-tests.xml


Modified: trunk/mysqltest-2.0/programs.xml
===================================================================
--- trunk/mysqltest-2.0/programs.xml	2011-04-18 11:03:38 UTC (rev 25911)
+++ trunk/mysqltest-2.0/programs.xml	2011-04-18 11:55:44 UTC (rev 25912)
Changed blocks: 2, Lines Added: 50, Lines Deleted: 0; 2057 bytes

@@ -3207,6 +3207,31 @@
           <para>
             <indexterm>
               <primary>mysql-test-run.pl</primary>
+              <secondary>nounit-tests option</secondary>
+            </indexterm>
+
+            <indexterm>
+              <primary>nounit-tests option</primary>
+              <secondary>mysql-test-run.pl</secondary>
+            </indexterm>
+
+            <option>--nounit-tests</option>
+          </para>
+
+          <para>
+            Do not run unit tests, overriding default behaviour or
+            setting of the <literal>MTR_UNIT_TESTS</literal> variable.
+          </para>
+
+          <para>
+            Running of unit tests was enabled from MySQL 5.5.11.
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            <indexterm>
+              <primary>mysql-test-run.pl</primary>
               <secondary>nowarnings option</secondary>
             </indexterm>
 

@@ -4062,6 +4087,31 @@
           <para>
             <indexterm>
               <primary>mysql-test-run.pl</primary>
+              <secondary>unit-tests option</secondary>
+            </indexterm>
+
+            <indexterm>
+              <primary>unit-tests option</primary>
+              <secondary>mysql-test-run.pl</secondary>
+            </indexterm>
+
+            <option>--unit-tests</option>
+          </para>
+
+          <para>
+            Force running of unit tests, overriding default behaviour or
+            setting of the <literal>MTR_UNIT_TESTS</literal> variable.
+          </para>
+
+          <para>
+            Running of unit tests was enabled from MySQL 5.5.11.
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
+            <indexterm>
+              <primary>mysql-test-run.pl</primary>
               <secondary>user option</secondary>
             </indexterm>
 


Modified: trunk/mysqltest-2.0/unit-tests.xml
===================================================================
--- trunk/mysqltest-2.0/unit-tests.xml	2011-04-18 11:03:38 UTC (rev 25911)
+++ trunk/mysqltest-2.0/unit-tests.xml	2011-04-18 11:55:44 UTC (rev 25912)
Changed blocks: 3, Lines Added: 58, Lines Deleted: 1; 3024 bytes

@@ -81,6 +81,14 @@
 
     <title>Unit Testing Using the Google Test Framework</title>
 
+    <indexterm>
+      <primary>unit tests</primary>
+      <secondary>Google test</secondary>
+    </indexterm>
+
+    <indexterm>
+      <primary>Google test framework</primary>
+    </indexterm>
     <para>
       The Google Test unit-testing framework is available in MySQL
       source trees and distributions as of MySQL 5.6.1. Google Test,

@@ -294,7 +302,7 @@
     <para>
       For internal MySQL testing, PushBuild has been extended to install
       Google Test as a separate <quote>package.</quote> All trees named
-      <literal>mysql-next-mr.*</literal> are set up to depend on this
+      <literal>mysql-trunk.*</literal> are set up to depend on this
       package.
     </para>
 

@@ -365,4 +373,53 @@
 
   </section>
 
+  <section id="unit-tests-from-mtr">
+
+    <indexterm>
+      <primary>unit tests</primary>
+      <secondary>From mysql-test-run.pl</secondary>
+    </indexterm>
+
+    <title>Unit Tests Added to Main Test Runs</title>
+
+    <para>
+      From MySQL 5.5.11, <command>mysql-test-run.pl</command> will also
+      run unit tests at the end of full test runs, when being run from
+      within a build directory. It depends on the unit tests having been
+      built and defined in a file <literal>CTestTestfile.cmake</literal>
+      in the top level build directory. Those will normally be there
+      after a build using <command>CMake</command>, but will not be in a
+      binary package.
+    </para>
+
+    <para>
+      The unit tests are run simply by executing
+      <command>ctest</command> with no arguments from the top level
+      build directory. The result will be shown as a single test at the
+      end, named <literal>unit_tests</literal> which passes if and only
+      if all unit tests pass. A summary of the result will be printed,
+      including the name of any failed unit tests. The set of unit tests
+      will be counted as one test (either passed or failed) in the
+      overall test summary.
+    </para>
+
+    <para>
+      Unit tests will by default be run only if you have not specified
+      any specific tests or suites on the command line for
+      <command>mysql-test-run.pl</command>. This can be overridden by
+      setting the environment variable <literal>MTR_UNIT_TESTS</literal>
+      to 0 or 1. This in turn can be overriden by a command line
+      argument <option>--unit-tests</option> or
+      <option>--nounit-tests</option>.
+    </para>
+
+    <para>
+      If the file <literal>CTestTestfile.cmake</literal> and the
+      <command>ctest</command> command are not both available, unit
+      tests will be silently skipped, unless you have used the command
+      line option <option>--unit-tests</option>.
+    </para>
+
+  </section>
+
 </chapter>


Thread
svn commit - mysqldoc@oter02: r25912 - trunk/mysqltest-2.0bjorn.munch18 Apr