File tree Expand file tree Collapse file tree 2 files changed +11
-5
lines changed Expand file tree Collapse file tree 2 files changed +11
-5
lines changed Original file line number Diff line number Diff line change @@ -116,9 +116,15 @@ test_single() {
116
116
gh-ost-test-mysql-replica --default-character-set=utf8mb4 test -e " set @@global.sql_mode='$( cat $tests_path /$test_name /sql_mode) '"
117
117
fi
118
118
119
- cat $tests_path /$test_name /create.sql
120
- bash -x gh-ost-test-mysql-master --default-character-set=utf8mb4 test < $tests_path /$test_name /create.sql
121
- echo $?
119
+ gh-ost-test-mysql-master --default-character-set=utf8mb4 test < $tests_path /$test_name /create.sql
120
+ test_create_result=$?
121
+
122
+ if [ $test_create_result -ne 0 ] ; then
123
+ echo
124
+ echo " ERROR $test_name create failure. cat $tests_path /$test_name /create.sql:"
125
+ cat $tests_path /$test_name /create.sql
126
+ return 1
127
+ fi
122
128
123
129
extra_args=" "
124
130
if [ -f $tests_path /$test_name /extra_args ] ; then
@@ -257,7 +263,7 @@ build_binary() {
257
263
258
264
test_all () {
259
265
build_binary
260
- find $tests_path ! -path . -type d -mindepth 1 -maxdepth 1 | cut -d " /" -f 3 | egrep " $test_pattern " | while read test_name ; do
266
+ find $tests_path ! -path . -type d -mindepth 1 -maxdepth 1 | cut -d " /" -f 3 | egrep " $test_pattern " | sort | while read test_name ; do
261
267
test_single " $test_name "
262
268
if [ $? -ne 0 ] ; then
263
269
create_statement=$( gh-ost-test-mysql-replica test -t -e " show create table _gh_ost_test_gho \G" )
Original file line number Diff line number Diff line change @@ -61,7 +61,7 @@ test_mysql_version() {
61
61
gh-ost-test-mysql-master -uroot -e " grant all on *.* to 'gh-ost'@'%'"
62
62
63
63
echo " ### Running gh-ost tests for $mysql_version "
64
- bash -x ./localtests/test.sh -b bin/gh-ost
64
+ ./localtests/test.sh -b bin/gh-ost
65
65
66
66
find sandboxes -name " stop_all" | bash
67
67
}
You can’t perform that action at this time.
0 commit comments