From ae2542b63212719555901f7340de7f88691fb195 Mon Sep 17 00:00:00 2001
From: unknown <joerg@mysql.com>
Date: Thu, 3 Mar 2005 13:04:44 +0100
Subject: [PATCH] Ensure that the tests with '--ps-protocol' and
 '--embedded-server' are taken even after the previous run had some failures,
 provided it did not totally crash.

Build-tools/Do-compile:
  Change the search string for a test run from "tests were successful" to just
  "were successful", which is written by the test run even after some failures.
  This is necessary to start the next test suite ('--ps-protocol', '--embedded-server')
  even after the previous one had some test failures.
mysql-test/mysql-test-run.sh:
  Change the message even after test failures so that it is fairly safe to identify
  the end of the run from it (as opposed to a crash of the script).
  It is essential that both a run without any and with some test failures
  write "were successful" so that it can be grepped.
---
 Build-tools/Do-compile       | 6 +++---
 mysql-test/mysql-test-run.sh | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Build-tools/Do-compile b/Build-tools/Do-compile
index e7ab3357de9..f9074d113ff 100755
--- a/Build-tools/Do-compile
+++ b/Build-tools/Do-compile
@@ -392,13 +392,13 @@ if ($opt_stage <= 5 && !$opt_no_test && !$opt_no_mysqltest)
   info("Running test suite");
   system("mkdir $bench_tmpdir") if (! -d $bench_tmpdir);
   safe_cd("${test_dir}/mysql-test");
-  check_system("./mysql-test-run $flags --tmpdir=$bench_tmpdir --master_port=$mysql_tcp_port --slave_port=$slave_port --ndbcluster_port=$ndbcluster_port --manager-port=$manager_port --no-manager --sleep=10", "tests were successful");
+  check_system("./mysql-test-run $flags --tmpdir=$bench_tmpdir --master_port=$mysql_tcp_port --slave_port=$slave_port --ndbcluster_port=$ndbcluster_port --manager-port=$manager_port --no-manager --sleep=10", "were successful");
 
   unless ($opt_skip_ps_test)
   {
     log_timestamp();
     info("Running test suite using prepared statements");
-    check_system("./mysql-test-run $flags --ps-protocol --tmpdir=$bench_tmpdir --master_port=$mysql_tcp_port --slave_port=$slave_port --ndbcluster_port=$ndbcluster_port --manager-port=$manager_port --no-manager --sleep=10", "tests were successful");
+    check_system("./mysql-test-run $flags --ps-protocol --tmpdir=$bench_tmpdir --master_port=$mysql_tcp_port --slave_port=$slave_port --ndbcluster_port=$ndbcluster_port --manager-port=$manager_port --no-manager --sleep=10", "were successful");
   }
   
   unless ($opt_skip_embedded_test)
@@ -407,7 +407,7 @@ if ($opt_stage <= 5 && !$opt_no_test && !$opt_no_mysqltest)
     info("Running embedded server test suite");
     # Embedded server and NDB don't jive
     $flags=~ s/ --with-ndbcluster//;
-    check_system("./mysql-test-run $flags --embedded-server --tmpdir=$bench_tmpdir --master_port=$mysql_tcp_port --slave_port=$slave_port --manager-port=$manager_port --no-manager --sleep=10", "tests were successful");
+    check_system("./mysql-test-run $flags --embedded-server --tmpdir=$bench_tmpdir --master_port=$mysql_tcp_port --slave_port=$slave_port --manager-port=$manager_port --no-manager --sleep=10", "were successful");
   }
   # 'mysql-test-run' writes its own final message for log evaluation.
 }
diff --git a/mysql-test/mysql-test-run.sh b/mysql-test/mysql-test-run.sh
index 8c484d2ddb1..d9172216919 100644
--- a/mysql-test/mysql-test-run.sh
+++ b/mysql-test/mysql-test-run.sh
@@ -833,7 +833,7 @@ report_stats () {
 	whole=`$PRINTF %.2s $raw`
 	xwhole=`$EXPR $whole \* 100`
 	deci=`$EXPR $raw - $xwhole`
-	$ECHO  "Failed ${TOT_FAIL}/${TOT_TEST} tests, ${whole}.${deci}% successful."
+	$ECHO  "Failed ${TOT_FAIL}/${TOT_TEST} tests, ${whole}.${deci}% were successful."
 	$ECHO ""
         $ECHO "The log files in $MY_LOG_DIR may give you some hint"
 	$ECHO "of what when wrong."