database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

mysql-test-run fixes:

Browse Source 
libexec support in install_test_db
--start-from in mysql-test-run


mysql-test/install_test_db.sh:
  libexec support in install_test_db
mysql-test/mysql-test-run.sh:
  --start-from in mysql-test-run
This commit is contained in:
unknown
2003-11-25 14:43:15 +01:00
parent fbe6f32ae2
commit 271502ffbf
2 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
mysql-test/install_test_db.sh
View File

@@ -12,11 +12,13 @@ if [ x$1 = x"-bin" ]; then
BINARY_DIST=1 BINARY_DIST=1
fix_bin=mysql-test fix_bin=mysql-test
scriptdir=../bin scriptdir=../bin
libexecdir=../libexec
else else
execdir=../sql execdir=../sql
bindir=../client bindir=../client
fix_bin=. fix_bin=.
scriptdir=../scripts scriptdir=../scripts
libexecdir=../libexec
fi fi
vardir=var vardir=var
@@ -36,8 +38,13 @@ EXTRA_ARG=""
if test ! -x $execdir/mysqld if test ! -x $execdir/mysqld
then then
echo "mysqld is missing - looked in $execdir" if test ! -x $libexecdir/mysqld
then
echo "mysqld is missing - looked in $execdir and in $libexecdir"
exit 1 exit 1
else
execdir=$libexecdir
fi
fi fi
# On IRIX hostname is in /usr/bsd so add this to the path # On IRIX hostname is in /usr/bsd so add this to the path

6
mysql-test/mysql-test-run.sh
View File

@@ -229,6 +229,7 @@ while test $# -gt 0; do
--local) USE_RUNNING_SERVER="" ;; --local) USE_RUNNING_SERVER="" ;;
--extern) USE_RUNNING_SERVER="1" ;; --extern) USE_RUNNING_SERVER="1" ;;
--tmpdir=*) MYSQL_TMP_DIR=`$ECHO "$1" | $SED -e "s;--tmpdir=;;"` ;; --tmpdir=*) MYSQL_TMP_DIR=`$ECHO "$1" | $SED -e "s;--tmpdir=;;"` ;;
--start-from=*) START_FROM=`$ECHO "$1" | $SED -e "s;--start-from=;;"` ;;
--local-master) --local-master)
MASTER_MYPORT=3306; MASTER_MYPORT=3306;
EXTRA_MYSQL_TEST_OPT="$EXTRA_MYSQL_TEST_OPT --host=127.0.0.1 \ EXTRA_MYSQL_TEST_OPT="$EXTRA_MYSQL_TEST_OPT --host=127.0.0.1 \
@@ -1185,6 +1186,11 @@ run_testcase ()
fi fi
fi fi
if [ "$tname" '<' "$START_FROM" ] ; then
# skip_test $tname;
return;
fi
if [ -n "$DO_TEST" ] ; then if [ -n "$DO_TEST" ] ; then
DO_THIS_TEST=`$EXPR \( $tname : "$DO_TEST" \) != 0` DO_THIS_TEST=`$EXPR \( $tname : "$DO_TEST" \) != 0`
if [ x$DO_THIS_TEST = x0 ] ; if [ x$DO_THIS_TEST = x0 ] ;