bk commit into 4.1 tree (msvensson:1.2553) BUG#24274

[msvensson]

Below is the list of changes that have just been committed into a local
4.1 repository of msvensson. When msvensson does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2006-11-17 13:14:07+01:00, msvensson@neptunus.(none) +2 -0
  BUG#24274 option "--big-test" of mysql-test-run.pl does not work anymore

  mysql-test/lib/mtr_cases.pl@stripped, 2006-11-17 13:14:04+01:00, msvensson@neptunus.(none) +4 -0
    Don't look at lines that start with # ie. a comment 

  mysql-test/mysql-test-run.pl@stripped, 2006-11-17 13:14:04+01:00, msvensson@neptunus.(none) +11 -9
    Set env BIG_TEST if --big-test passed

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	msvensson
# Host:	neptunus.(none)
# Root:	/home/msvensson/mysql/mysql-4.1-maint

--- 1.22/mysql-test/lib/mtr_cases.pl	2006-11-17 13:14:10 +01:00
+++ 1.23/mysql-test/lib/mtr_cases.pl	2006-11-17 13:14:10 +01:00
@@ -593,6 +593,10 @@ sub mtr_options_from_test_file($$) {
 
   while ( my $line= <$F> )
   {
+
+    # Skip line if it start's with #
+    next if ( $line =~ /^#/ );
+
     # Match this line against tag in "tags" array
     foreach my $tag (@tags)
     {

--- 1.142/mysql-test/mysql-test-run.pl	2006-11-17 13:14:10 +01:00
+++ 1.143/mysql-test/mysql-test-run.pl	2006-11-17 13:14:10 +01:00
@@ -163,7 +163,7 @@ our $exe_libtool;
 
 our $opt_bench= 0;
 our $opt_small_bench= 0;
-our $opt_big_test= 0;            # Send --big-test to mysqltest
+our $opt_big_test= 0;
 
 our @opt_extra_mysqld_opt;
 
@@ -913,6 +913,14 @@ sub command_line_setup () {
   }
 
   # --------------------------------------------------------------------------
+  # Big test flags
+  # --------------------------------------------------------------------------
+   if ( $opt_big_test )
+   {
+     $ENV{'BIG_TEST'}= 1;
+   }
+
+  # --------------------------------------------------------------------------
   # Gcov flag
   # --------------------------------------------------------------------------
   if ( $opt_gcov and ! $opt_source_dist )
@@ -4269,11 +4277,6 @@ sub run_mysqltest ($) {
     mtr_add_arg($args, "--timer-file=%s/log/timer", $opt_vardir);
   }
 
-  if ( $opt_big_test )
-  {
-    mtr_add_arg($args, "--big-test");
-  }
-
   if ( $opt_compress )
   {
     mtr_add_arg($args, "--compress");
@@ -4662,9 +4665,8 @@ Options to control what test suites or c
   skip-rpl              Skip the replication test cases.
   skip-im               Don't start IM, and skip the IM test cases
   skip-test=PREFIX      Skip test cases which name are prefixed with PREFIX
-  big-test              Pass "--big-test" to mysqltest which will set the
-                        environment variable BIG_TEST, which can be checked
-                        from test cases.
+  big-test              Set the environment variable BIG_TEST, which can be
+                        checked from test cases.
 
 Options that specify ports