Commit ac25ff76 authored by unknown's avatar unknown

a trick for --client-gdb to work for both statically and dynamically linked client

better exit code checking

parent e0d818f3
...@@ -258,7 +258,12 @@ DASH72=`$ECHO '----------------------------------------------------------------- ...@@ -258,7 +258,12 @@ DASH72=`$ECHO '-----------------------------------------------------------------
# on binary, use what is installed # on binary, use what is installed
if [ x$SOURCE_DIST = x1 ] ; then if [ x$SOURCE_DIST = x1 ] ; then
MYSQLD="$BASEDIR/sql/mysqld" 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" MYSQLADMIN="$BASEDIR/client/mysqladmin"
MYSQL="$BASEDIR/client/mysql" MYSQL="$BASEDIR/client/mysql"
LANGUAGE="$BASEDIR/sql/share/english/" LANGUAGE="$BASEDIR/sql/share/english/"
...@@ -788,7 +793,10 @@ run_testcase () ...@@ -788,7 +793,10 @@ run_testcase ()
$ECHO "$RES$RES_SPACE [ pass ]" $ECHO "$RES$RES_SPACE [ pass ]"
else else
# why the following ``if'' ? That is why res==1 is special ? # 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 total_inc
fail_inc fail_inc
$ECHO "$RES$RES_SPACE [ fail ]" $ECHO "$RES$RES_SPACE [ fail ]"
...@@ -812,9 +820,6 @@ run_testcase () ...@@ -812,9 +820,6 @@ run_testcase ()
fi fi
$ECHO "Resuming Tests" $ECHO "Resuming Tests"
$ECHO "" $ECHO ""
else
skip_inc
$ECHO "$RES$RES_SPACE [ skipped ]"
fi fi
fi fi
fi fi
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment