diff options
| author | guilhem@mysql.com <> | 2003-10-30 16:12:21 +0100 |
|---|---|---|
| committer | guilhem@mysql.com <> | 2003-10-30 16:12:21 +0100 |
| commit | 80793657b41c9b01052de8f967e8b15804837b05 (patch) | |
| tree | a485d659796d3d2b5425b8b00983575576223f89 /mysql-test | |
| parent | 59d0872aa05e8b02e78db16b1afbe2837af333cf (diff) | |
| download | mariadb-git-80793657b41c9b01052de8f967e8b15804837b05.tar.gz | |
Fix to be able to run
mysql-test-run --manager --valgrind
(without this fix, the manager fails to start mysqld and the tests hang).
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/mysql-test-run.sh | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/mysql-test/mysql-test-run.sh b/mysql-test/mysql-test-run.sh index d155c02c652..cd409e1ace5 100644 --- a/mysql-test/mysql-test-run.sh +++ b/mysql-test/mysql-test-run.sh @@ -336,7 +336,13 @@ while test $# -gt 0; do EXTRA_SLAVE_MYSQLD_OPT="$EXTRA_SLAVE_MYSQLD_OPT --gdb" ;; --valgrind) - VALGRIND="valgrind --alignment=8 --leak-check=yes --num-callers=16" + VALGRIND=`which valgrind` # this will print an error if not found + # Give good warning to the user and stop + if [ -z "$VALGRIND" ] ; then + $ECHO "You need to have the 'valgrind' program in your PATH to run mysql-test-run with option --valgrind. Valgrind's home page is http://developer.kde.org/~sewardj ." + exit 1 + fi + VALGRIND="$VALGRIND --alignment=8 --leak-check=yes --num-callers=16" EXTRA_MASTER_MYSQLD_OPT="$EXTRA_MASTER_MYSQLD_OPT --skip-safemalloc --skip-bdb" EXTRA_SLAVE_MYSQLD_OPT="$EXTRA_SLAVE_MYSQLD_OPT --skip-safemalloc --skip-bdb" SLEEP_TIME_AFTER_RESTART=10 |