summaryrefslogtreecommitdiff
path: root/mysql-test
diff options
context:
space:
mode:
authorunknown <serg@serg.mysql.com>2001-07-13 13:58:25 +0200
committerunknown <serg@serg.mysql.com>2001-07-13 13:58:25 +0200
commitac25ff766f0fa1e4fa68efbc29e0dada6b3227ec (patch)
tree9830acfacbf54e541fe3250cee45fc44172ccd17 /mysql-test
parente0d818f3abc2ed257c6f48737e41b1f3a972357f (diff)
downloadmariadb-git-ac25ff766f0fa1e4fa68efbc29e0dada6b3227ec.tar.gz
a trick for --client-gdb to work for both statically and dynamically linked client
better exit code checking
Diffstat (limited to 'mysql-test')
-rw-r--r--mysql-test/mysql-test-run.sh15
1 files changed, 10 insertions, 5 deletions
diff --git a/mysql-test/mysql-test-run.sh b/mysql-test/mysql-test-run.sh
index e76725c6dbd..321b14d8f9d 100644
--- a/mysql-test/mysql-test-run.sh
+++ b/mysql-test/mysql-test-run.sh
@@ -258,7 +258,12 @@ DASH72=`$ECHO '-----------------------------------------------------------------
# on binary, use what is installed
if [ x$SOURCE_DIST = x1 ] ; then
MYSQLD="$BASEDIR/sql/mysqld"
- MYSQL_TEST="$BASEDIR/client/.libs/lt-mysqltest" # for --client-gdb to work
+ if [ -e "$BASEDIR/client/.libs/mysqltest" ] ; then
+ [ -e "$BASEDIR/client/.libs/lt-mysqltest" ] || $BASEDIR/client/mysqltest -V
+ MYSQL_TEST="$BASEDIR/client/.libs/lt-mysqltest"
+ else
+ MYSQL_TEST="$BASEDIR/client/mysqltest"
+ fi
MYSQLADMIN="$BASEDIR/client/mysqladmin"
MYSQL="$BASEDIR/client/mysql"
LANGUAGE="$BASEDIR/sql/share/english/"
@@ -788,7 +793,10 @@ run_testcase ()
$ECHO "$RES$RES_SPACE [ pass ]"
else
# why the following ``if'' ? That is why res==1 is special ?
- if [ $res = 1 ]; then
+ if [ $res = 2 ]; then
+ skip_inc
+ $ECHO "$RES$RES_SPACE [ skipped ]"
+ else
total_inc
fail_inc
$ECHO "$RES$RES_SPACE [ fail ]"
@@ -812,9 +820,6 @@ run_testcase ()
fi
$ECHO "Resuming Tests"
$ECHO ""
- else
- skip_inc
- $ECHO "$RES$RES_SPACE [ skipped ]"
fi
fi
fi