From 6e0d2e41cccb9223b50212dfecf56e43f19df11e Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 1 Mar 2006 12:21:44 +0100 Subject: [PATCH 1/2] mysql-test/mysql-test-run.sh : Add a "--comment=" option, to get it logged when the test is run. mysql-test/mysql-test-run.sh: Add a "--comment=" option, to get it logged when the test is run. The purpose is to allow a better analysis when generating the status page ("gen-build-status-page"). See "Do-compile" for how it is used. --- mysql-test/mysql-test-run.sh | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/mysql-test/mysql-test-run.sh b/mysql-test/mysql-test-run.sh index 3488c308536..5853ffa201c 100644 --- a/mysql-test/mysql-test-run.sh +++ b/mysql-test/mysql-test-run.sh @@ -410,6 +410,13 @@ while test $# -gt 0; do --fast) FAST_START=1 ;; + --comment=*) + TMP=`$ECHO "$1" | $SED -e "s;--comment=;;"` + echo + echo '############################################' + echo "# $TMP" + echo '############################################' + ;; -- ) shift; break ;; --* ) $ECHO "Unrecognized option: $1"; exit 1 ;; * ) break ;; From ca3dd7f01aae783c2f8efea6adbf446e2c410c42 Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 1 Mar 2006 13:15:37 +0100 Subject: [PATCH 2/2] mysql-test/mysql-test-run.pl : Add a "--comment=" option (backport from 5.1). mysql-test/mysql-test-run.pl: Add a "--comment=" option (backport from 5.1). Its sole purpose is to get logged, so that test evaluation gets easier. See "Do-compile" for how it is called, and "gen-build-status-page" for its effect. --- mysql-test/mysql-test-run.pl | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index addacab8f9a..09c3dff9749 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -184,6 +184,7 @@ our $opt_big_test= 0; # Send --big-test to mysqltest our @opt_extra_mysqld_opt; +our $opt_comment; our $opt_compress; our $opt_current_test; our $opt_ddd; @@ -536,6 +537,7 @@ sub command_line_setup () { # Misc 'big-test' => \$opt_big_test, + 'comment=s' => \$opt_comment, 'compress' => \$opt_compress, 'debug' => \$opt_debug, 'fast' => \$opt_fast, @@ -571,6 +573,14 @@ sub command_line_setup () { usage(""); } + if ( $opt_comment ) + { + print "\n"; + print '#' x 78, "\n"; + print "# $opt_comment\n"; + print '#' x 78, "\n\n"; + } + foreach my $arg ( @ARGV ) { if ( $arg =~ /^--skip-/ ) @@ -2398,6 +2408,7 @@ Misc options verbose Verbose output from this script script-debug Debug this script itself + comment=STR Write STR to the output compress Use the compressed protocol between client and server timer Show test case execution time start-and-exit Only initiate and start the "mysqld" servers, use the startup