mirror of
https://github.com/MariaDB/server.git
synced 2025-07-30 16:24:05 +03:00
Manual merge of the added "--comment=<string>" option
to both the Shell and the Perl vaerion of "mysql-test-run"-
This commit is contained in:
@ -193,6 +193,7 @@ our $opt_big_test= 0; # Send --big-test to mysqltest
|
|||||||
|
|
||||||
our @opt_extra_mysqld_opt;
|
our @opt_extra_mysqld_opt;
|
||||||
|
|
||||||
|
our $opt_comment;
|
||||||
our $opt_compress;
|
our $opt_compress;
|
||||||
our $opt_ssl;
|
our $opt_ssl;
|
||||||
our $opt_skip_ssl;
|
our $opt_skip_ssl;
|
||||||
@ -600,6 +601,7 @@ sub command_line_setup () {
|
|||||||
|
|
||||||
# Misc
|
# Misc
|
||||||
'big-test' => \$opt_big_test,
|
'big-test' => \$opt_big_test,
|
||||||
|
'comment=s' => \$opt_comment,
|
||||||
'debug' => \$opt_debug,
|
'debug' => \$opt_debug,
|
||||||
'fast' => \$opt_fast,
|
'fast' => \$opt_fast,
|
||||||
'local' => \$opt_local,
|
'local' => \$opt_local,
|
||||||
@ -633,6 +635,14 @@ sub command_line_setup () {
|
|||||||
usage("");
|
usage("");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if ( $opt_comment )
|
||||||
|
{
|
||||||
|
print "\n";
|
||||||
|
print '#' x 78, "\n";
|
||||||
|
print "# $opt_comment\n";
|
||||||
|
print '#' x 78, "\n\n";
|
||||||
|
}
|
||||||
|
|
||||||
foreach my $arg ( @ARGV )
|
foreach my $arg ( @ARGV )
|
||||||
{
|
{
|
||||||
if ( $arg =~ /^--skip-/ )
|
if ( $arg =~ /^--skip-/ )
|
||||||
@ -2997,6 +3007,7 @@ Options for coverage, profiling etc
|
|||||||
|
|
||||||
Misc options
|
Misc options
|
||||||
|
|
||||||
|
comment=STR Write STR to the output
|
||||||
verbose Verbose output from this script
|
verbose Verbose output from this script
|
||||||
script-debug Debug this script itself
|
script-debug Debug this script itself
|
||||||
timer Show test case execution time
|
timer Show test case execution time
|
||||||
|
@ -555,7 +555,14 @@ while test $# -gt 0; do
|
|||||||
FAST_START=1
|
FAST_START=1
|
||||||
;;
|
;;
|
||||||
--use-old-data)
|
--use-old-data)
|
||||||
USE_OLD_DATA=1;
|
USE_OLD_DATA=1
|
||||||
|
;;
|
||||||
|
--comment=*)
|
||||||
|
TMP=`$ECHO "$1" | $SED -e "s;--comment=;;"`
|
||||||
|
echo
|
||||||
|
echo '############################################'
|
||||||
|
echo "# $TMP"
|
||||||
|
echo '############################################'
|
||||||
;;
|
;;
|
||||||
-- ) shift; break ;;
|
-- ) shift; break ;;
|
||||||
--* ) $ECHO "Unrecognized option: $1"; exit 1 ;;
|
--* ) $ECHO "Unrecognized option: $1"; exit 1 ;;
|
||||||
|
Reference in New Issue
Block a user