Author: paul
Date: 2006-04-24 21:48:35 +0200 (Mon, 24 Apr 2006)
New Revision: 1921
Log:
r6906@polar: paul | 2006-04-24 14:44:29 -0500
General revisions.
Modified:
trunk/
trunk/mysqltest/introduction.xml
trunk/mysqltest/mysqltest.xml
Property changes on: trunk
___________________________________________________________________
Name: svk:merge
- 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:6874
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:9647
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:4590
+ 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:6906
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:9647
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:4590
Modified: trunk/mysqltest/introduction.xml
===================================================================
--- trunk/mysqltest/introduction.xml 2006-04-24 18:02:43 UTC (rev 1920)
+++ trunk/mysqltest/introduction.xml 2006-04-24 19:48:35 UTC (rev 1921)
@@ -38,9 +38,9 @@
<para>
The <command>mysql-test-run</command> application starts MySQL
servers, restarts them as necessary when a specific test case needs
- different start arguments, and presents the test result. The
- <command>mysql-test-run</command> application invokes the
- <command>mysqltest</command> program to run a single test case,
+ different start arguments, and presents the test result. For each
+ test case, <command>mysql-test-run</command> invokes the
+ <command>mysqltest</command> program to read the test case file,
intepret the test language constructs, and send SQL statements to
the server. <command>mysqltest</command> is also referred to as the
<quote>test engine.</quote>
@@ -55,7 +55,7 @@
<para>
For a MySQL source distribution, <command>mysql-test-run</command>
- is located in the <filename>mysql-test</filename> directory.
+ is located in the <filename>mysql-test</filename> directory, and
<command>mysqltest</command> is located in the
<filename>client</filename> directory. The
<filename>mysql-test</filename> and <filename>client</filename>
@@ -64,7 +64,7 @@
<para>
For a MySQL binary distribution, <command>mysql-test-run</command>
- is located in the <filename>mysql-test</filename> directory.
+ is located in the <filename>mysql-test</filename> directory, and
<command>mysqltest</command> is located in the same directory where
other client programs such as <command>mysql</command> or
<command>mysqladmin</command> are installed. The locations of the
@@ -73,12 +73,16 @@
</para>
<para>
- Test case input files and result files are stored in the
- <filename>mysql-test/t</filename> and
- <filename>mysql-test/r</filename> directories, respectively. The
- input and result files have the same basename, which is the test
- name, but have extensions of <filename>.test</filename> and
- <filename>.result</filename>, respectively.
+ Within the <filename>mysql-test</filename> directory, test case
+ input files and result files are stored in the
+ <filename>t</filename> and <filename>r</filename> directories,
+ respectively. The input and result files have the same basename,
+ which is the test name, but have extensions of
+ <filename>.test</filename> and <filename>.result</filename>,
+ respectively. For example, for a test named <quote>decimal,</quote>
+ the input and result files are
+ <filename>mysql-test/t/decimal.test</filename> and
+ <filename>mysql-test/r/decimal.result</filename>.
</para>
<para>
@@ -96,36 +100,37 @@
<listitem>
<para>
The <command>mysqltest</command> test engine checks the result
- codes from executing each SQL statement. If the failure is
- unexpected, the test case fails.
+ codes from executing each SQL statement in the test input. If
+ the failure is unexpected, the test case fails.
</para>
</listitem>
<listitem>
<para>
The test case can fail by producing incorrect output. As a test
- runs, it writes the result from <literal>SELECT</literal>,
- <literal>SHOW</literal>, and other statements to a file. This
- file is compared to the expected trace found in the
- <filename>mysql-test/r</filename> directory (in a file with a
- <filename>.result</filename> suffix). If the files containing
- the expected and actual results differ, the test case fails and
- the difference is presented for evaluation. When test case
- failure occurs, the actual test result is written to a file in
- the <filename>mysql-test/r</filename> directory with a
- <filename>.reject</filename> suffix.
+ runs, it produces output (the results from
+ <literal>SELECT</literal>, <literal>SHOW</literal>, and other
+ statements). This output is compared to the expected result
+ found in the <filename>mysql-test/r</filename> directory (in a
+ file with a <filename>.result</filename> suffix). If the
+ expected and actual results differ, the test case fails. The
+ actual test result is written to a file in the
+ <filename>mysql-test/r</filename> directory with a
+ <filename>.reject</filename> suffix, and the difference between
+ the <filename>.result</filename> and
+ <filename>.reject</filename> files is presented for evaluation.
</para>
</listitem>
</itemizedlist>
<para>
- This method of comparing the result trace puts some restrictions on
- how test cases can be written. For example, the result cannot
- contain information that varies from run to run, such as the current
- time. However, if the information that varies is unimportant for
- test evaluation, there are ways to instruct the test engine to
- replace those fields in the output with fixed values.
+ This method of checking test results puts some restrictions on how
+ test cases can be written. For example, the result cannot contain
+ information that varies from run to run, such as the current time.
+ However, if the information that varies is unimportant for test
+ evaluation, there are ways to instruct the test engine to replace
+ those fields in the output with fixed values.
</para>
<para>
Modified: trunk/mysqltest/mysqltest.xml
===================================================================
--- trunk/mysqltest/mysqltest.xml 2006-04-24 18:02:43 UTC (rev 1920)
+++ trunk/mysqltest/mysqltest.xml 2006-04-24 19:48:35 UTC (rev 1921)
@@ -75,8 +75,9 @@
<listitem>
<para>
For all other uses, such as selling printed copies or
- using the manual in whole or in part within another publication, prior
- written agreement from MySQL AB is required.
+ using the manual in whole or in part within another
+ publication, prior written agreement from MySQL AB is
+ required.
</para>
</listitem>
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r1921 - in trunk: . mysqltest | paul | 24 Apr |
