diff options
| author | unknown <msvensson@neptunus.(none)> | 2005-12-07 14:54:06 +0100 |
|---|---|---|
| committer | unknown <msvensson@neptunus.(none)> | 2005-12-07 14:54:06 +0100 |
| commit | 1b50a968033b0644fe63fb231a564aa1b7b1d0bf (patch) | |
| tree | a5cbf887322a9c2c73f1fe998a54d4af184c4c0b /mysql-test/mysql-test-run.sh | |
| parent | 861dc95767bd412d9ee2688bc8943352bf110fe4 (diff) | |
| download | mariadb-git-1b50a968033b0644fe63fb231a564aa1b7b1d0bf.tar.gz | |
valgrind for mysqltest
mysql-test/mysql-test-run.sh:
Dont add valgrind to the MYSQL_TEST variable
Diffstat (limited to 'mysql-test/mysql-test-run.sh')
| -rw-r--r-- | mysql-test/mysql-test-run.sh | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/mysql-test/mysql-test-run.sh b/mysql-test/mysql-test-run.sh index 517ce0420e6..3a8aa8614a2 100644 --- a/mysql-test/mysql-test-run.sh +++ b/mysql-test/mysql-test-run.sh @@ -770,11 +770,6 @@ then SLAVE_MYSQLD=$MYSQLD fi -# If mysqltest should be valgrinded, add valgrind and options to MYSQL_TEST -if ! [ -z "$VALGRIND_MYSQLTEST" ] ; then - MYSQL_TEST="$VALGRIND_MYSQLTEST $MYSQL_TEST" -fi - # If we should run all tests cases, we will use a local server for that if [ -z "$1" -a -z "$DO_STRESS" ] @@ -831,7 +826,10 @@ if [ x$USE_TIMER = x1 ] ; then fi MYSQL_TEST_BIN=$MYSQL_TEST MYSQL_TEST="$MYSQL_TEST $MYSQL_TEST_ARGS" + +# Export MYSQL_TEST variable for use from .test files export MYSQL_TEST + GDB_CLIENT_INIT=$MYSQL_TMP_DIR/gdbinit.client GDB_MASTER_INIT=$MYSQL_TMP_DIR/gdbinit.master GDB_SLAVE_INIT=$MYSQL_TMP_DIR/gdbinit.slave @@ -1780,7 +1778,7 @@ run_testcase () $RM -f r/$tname.*reject mysql_test_args="-R $result_file $EXTRA_MYSQL_TEST_OPT" if [ -z "$DO_CLIENT_GDB" ] ; then - `$MYSQL_TEST $mysql_test_args < $tf 2> $TIMEFILE`; + `$VALGRIND_MYSQLTEST $MYSQL_TEST $mysql_test_args < $tf 2> $TIMEFILE`; else do_gdb_test "$mysql_test_args" "$tf" fi |