summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorunknown <msvensson@neptunus.(none)>2006-10-05 22:05:42 +0200
committerunknown <msvensson@neptunus.(none)>2006-10-05 22:05:42 +0200
commit93a9883bed4acacf5d5cad9c04255047f1679ec6 (patch)
treeeada0b7f9b8fe575783c922a8d677481e44ccf24
parent16b9d8d15ab9f00b02b90bd3a5e50cb3d9543487 (diff)
downloadmariadb-git-93a9883bed4acacf5d5cad9c04255047f1679ec6.tar.gz
Add policy directive about keeping mysqltest framework tools identical in all versions
mysql-test/mysql-test-run.pl: Add policy directive about keeping mysqltest framework tools identical in all versions Cleanup the initial comment to reflect current state
-rw-r--r--client/mysqltest.c2
-rwxr-xr-xmysql-test/mysql-test-run.pl43
2 files changed, 17 insertions, 28 deletions
diff --git a/client/mysqltest.c b/client/mysqltest.c
index 96bb5d6b80b..cf3afced427 100644
--- a/client/mysqltest.c
+++ b/client/mysqltest.c
@@ -22,6 +22,8 @@
See the "MySQL Test framework manual" for more information
http://dev.mysql.com/doc/mysqltest/en/index.html
+ Please keep the test framework tools identical in all versions!
+
Written by:
Sasha Pachev <sasha@mysql.com>
Matt Wagner <matt@mysql.com>
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
index 995baf2c0dd..6c8befdafa6 100755
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@@ -1,30 +1,24 @@
#!/usr/bin/perl
# -*- cperl -*-
-# This is a transformation of the "mysql-test-run" Bourne shell script
-# to Perl. There are reasons this rewrite is not the prettiest Perl
-# you have seen
#
-# - The original script is huge and for most part uncommented,
-# not even a usage description of the flags.
+##############################################################################
+#
+# mysql-test-run.pl
+#
+# Tool used for executing a suite of .test file
#
-# - There has been an attempt to write a replacement in C for the
-# original Bourne shell script. It was kind of working but lacked
-# lot of functionality to really be a replacement. Not to redo
-# that mistake and catch all the obscure features of the original
-# script, the rewrite in Perl is more close to the original script
-# meaning it also share some of the ugly parts as well.
+# See the "MySQL Test framework manual" for more information
+# http://dev.mysql.com/doc/mysqltest/en/index.html
#
-# - The original intention was that this script was to be a prototype
-# to be the base for a new C version with full functionality. Since
-# then it was decided that the Perl version should replace the
-# Bourne shell version, but the Perl style still reflects the wish
-# to make the Perl to C step easy.
+# Please keep the test framework tools identical in all versions!
+#
+##############################################################################
#
-# Some coding style from the original intent has been kept
+# Coding style directions for this perl script
#
# - To make this Perl script easy to alter even for those that not
-# code Perl that often, the coding style is as close as possible to
+# code Perl that often, keeep the coding style as close as possible to
# the C/C++ MySQL coding standard.
#
# - All lists of arguments to send to commands are Perl lists/arrays,
@@ -42,15 +36,6 @@
# the information. This separates the "find information" from the
# "do the work" and makes the program more easy to maintain.
#
-# - At the moment, there are tons of "global" variables that control
-# this script, even accessed from the files in "lib/*.pl". This
-# will change over time, for now global variables are used instead
-# of using %opt, %path and %exe hashes, because I want more
-# compile time checking, that hashes would not give me. Once this
-# script is debugged, hashes will be used and passed as parameters
-# to functions, to more closely mimic how it would be coded in C
-# using structs.
-#
# - The rule when it comes to the logic of this program is
#
# command_line_setup() - is to handle the logic between flags
@@ -2758,10 +2743,12 @@ sub do_after_run_mysqltest($)
my $tinfo= shift;
my $tname= $tinfo->{'name'};
+ mtr_tofile($path_mysqltest_log,"CURRENT TEST $tname\n");
+
# Save info from this testcase run to mysqltest.log
mtr_appendfile_to_file($path_timefile, $path_mysqltest_log)
if -f $path_timefile;
- mtr_tofile($path_mysqltest_log,"CURRENT TEST $tname\n");
+
}