From 756f3d30e8d4252f30f5e7a8721a158e789355d6 Mon Sep 17 00:00:00 2001
From: dm-2 <45519614+dm-2@users.noreply.github.com>
Date: Fri, 18 Nov 2022 15:44:14 +0000
Subject: [PATCH] add error detection for test setup, sort tests to make it
 easier to track progress

---
 localtests/test.sh                  | 14 ++++++++++----
 script/cibuild-gh-ost-replica-tests |  2 +-
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/localtests/test.sh b/localtests/test.sh
index b953861..5ca06ad 100755
--- a/localtests/test.sh
+++ b/localtests/test.sh
@@ -116,9 +116,15 @@ test_single() {
     gh-ost-test-mysql-replica --default-character-set=utf8mb4 test -e "set @@global.sql_mode='$(cat $tests_path/$test_name/sql_mode)'"
   fi
 
-  cat $tests_path/$test_name/create.sql
-  bash -x gh-ost-test-mysql-master --default-character-set=utf8mb4 test < $tests_path/$test_name/create.sql
-  echo $?
+  gh-ost-test-mysql-master --default-character-set=utf8mb4 test < $tests_path/$test_name/create.sql
+  test_create_result=$?
+
+  if [ $test_create_result -ne 0 ] ; then
+    echo
+    echo "ERROR $test_name create failure. cat $tests_path/$test_name/create.sql:"
+    cat $tests_path/$test_name/create.sql
+    return 1
+  fi
 
   extra_args=""
   if [ -f $tests_path/$test_name/extra_args ] ; then
@@ -257,7 +263,7 @@ build_binary() {
 
 test_all() {
   build_binary
-  find $tests_path ! -path . -type d -mindepth 1 -maxdepth 1 | cut -d "/" -f 3 | egrep "$test_pattern" | while read test_name ; do
+  find $tests_path ! -path . -type d -mindepth 1 -maxdepth 1 | cut -d "/" -f 3 | egrep "$test_pattern" | sort | while read test_name ; do
     test_single "$test_name"
     if [ $? -ne 0 ] ; then
       create_statement=$(gh-ost-test-mysql-replica test -t -e "show create table _gh_ost_test_gho \G")
diff --git a/script/cibuild-gh-ost-replica-tests b/script/cibuild-gh-ost-replica-tests
index 0c37b27..c4dbfd2 100755
--- a/script/cibuild-gh-ost-replica-tests
+++ b/script/cibuild-gh-ost-replica-tests
@@ -61,7 +61,7 @@ test_mysql_version() {
   gh-ost-test-mysql-master -uroot -e "grant all on *.* to 'gh-ost'@'%'"
 
   echo "### Running gh-ost tests for $mysql_version"
-  bash -x ./localtests/test.sh -b bin/gh-ost
+  ./localtests/test.sh -b bin/gh-ost
 
   find sandboxes -name "stop_all" | bash
 }