mirror of
https://github.com/MariaDB/server.git
synced 2025-07-30 16:24:05 +03:00
updates for the new build
configure.in: support for static nss on Linux when compiling --with-other-libc mysql-test/mysql-test-run.sh: --user-test option
This commit is contained in:
@ -124,6 +124,7 @@ MASTER_MYPORT=9306
|
||||
SLAVE_RUNNING=0
|
||||
SLAVE_MYPORT=9307
|
||||
NO_SLAVE=0
|
||||
USER_TEST=
|
||||
|
||||
EXTRA_MASTER_OPT=""
|
||||
EXTRA_MYSQL_TEST_OPT=""
|
||||
@ -174,6 +175,9 @@ while test $# -gt 0; do
|
||||
EXTRA_MYSQL_TEST_OPT="$EXTRA_MYSQL_TEST_OPT $1"
|
||||
SLEEP_TIME=`$ECHO "$1" | $SED -e "s;--sleep=;;"`
|
||||
;;
|
||||
--user-test=*)
|
||||
USER_TEST=`$ECHO "$1" | $SED -e "s;--user-test=;;"`
|
||||
;;
|
||||
--mysqld=*)
|
||||
TMP=`$ECHO "$1" | $SED -e "s;--mysqld=;;"`
|
||||
EXTRA_MASTER_MYSQLD_OPT="$EXTRA_MASTER_MYSQLD_OPT $TMP"
|
||||
@ -905,11 +909,16 @@ then
|
||||
if [ x$RECORD = x1 ]; then
|
||||
$ECHO "Will not run in record mode without a specific test case."
|
||||
else
|
||||
for tf in $TESTDIR/*.$TESTSUFFIX
|
||||
do
|
||||
run_testcase $tf
|
||||
done
|
||||
$RM -f $TIMEFILE # Remove for full test
|
||||
if [ -z "$USER_TEST" ]
|
||||
then
|
||||
for tf in $TESTDIR/*.$TESTSUFFIX
|
||||
do
|
||||
run_testcase $tf
|
||||
done
|
||||
$RM -f $TIMEFILE # Remove for full test
|
||||
else
|
||||
$USER_TEST
|
||||
fi
|
||||
fi
|
||||
else
|
||||
tname=`$BASENAME $1 .test`
|
||||
|
Reference in New Issue
Block a user