Commit 3f31ebd5 authored by unknown's avatar unknown
Browse files

client_test.test: 

  Use TESTS_BINDIR to point out bin dir for "client_test"
mysql-test-run.sh:
  Export TESTS_BINDIR to be used from --exec


mysql-test/mysql-test-run.sh:
  Export TESTS_BINDIR to be used from --exec
mysql-test/t/client_test.test:
  Use TESTS_BINDIR to point out bin dir for "client_test"
parent 8a63a0b5

mysql-test/mysql-test-run.sh

+3 −1
Original line number Diff line number Diff line
@@ -507,6 +507,7 @@ if [ x$SOURCE_DIST = x1 ] ; then 
 fi



 CLIENT_BINDIR="$BASEDIR/client"

 TESTS_BINDIR="$BASEDIR/tests"

 MYSQLADMIN="$CLIENT_BINDIR/mysqladmin"

 WAIT_PID="$BASEDIR/extra/mysql_waitpid"

 MYSQL_MANAGER_CLIENT="$CLIENT_BINDIR/mysqlmanagerc"
@@ -525,6 +526,7 @@ else 
   MYSQLD="$VALGRIND $BASEDIR/bin/mysqld"

 fi

 CLIENT_BINDIR="$BASEDIR/bin"

 TESTS_BINDIR="$BASEDIR/tests"

 MYSQL_TEST="$CLIENT_BINDIR/mysqltest"

 MYSQL_DUMP="$CLIENT_BINDIR/mysqldump"

 MYSQL_BINLOG="$CLIENT_BINDIR/mysqlbinlog"
@@ -582,7 +584,7 @@ MYSQL_DUMP="$MYSQL_DUMP --no-defaults -uroot --socket=$MASTER_MYSOCK --password= 
MYSQL_BINLOG="$MYSQL_BINLOG --no-defaults --local-load=$MYSQL_TMP_DIR $EXTRA_MYSQLBINLOG_OPT"

MYSQL_FIX_SYSTEM_TABLES="$MYSQL_FIX_SYSTEM_TABLES --no-defaults --host=localhost --port=$MASTER_MYPORT --socket=$MASTER_MYSOCK --user=root --password=$DBPASSWD --basedir=$BASEDIR --bindir=$CLIENT_BINDIR --verbose"

MYSQL="$MYSQL --host=localhost --port=$MASTER_MYPORT --socket=$MASTER_MYSOCK --user=root --password=$DBPASSWD"

export MYSQL MYSQL_DUMP MYSQL_BINLOG MYSQL_FIX_SYSTEM_TABLES CLIENT_BINDIR

export MYSQL MYSQL_DUMP MYSQL_BINLOG MYSQL_FIX_SYSTEM_TABLES CLIENT_BINDIR TESTS_BINDIR



MYSQL_TEST_ARGS="--no-defaults --socket=$MASTER_MYSOCK --database=$DB \

 --user=$DBUSER --password=$DBPASSWD --silent -v --skip-safemalloc \

mysql-test/t/client_test.test

+1 −1
Original line number Diff line number Diff line 
-- disable_result_log

--exec ../tests/client_test --testcase --user=root --socket=var/tmp/master.sock --port=$MYSQL_TCP_PORT
 
--exec $TESTS_BINDIR/client_test --testcase --user=root --socket=var/tmp/master.sock --port=$MYSQL_TCP_PORT