]> git.ipfire.org Git - thirdparty/openssh-portable.git/commitdiff
Put valgrind vgdb files to a specific directory.
authorDarren Tucker <dtucker@dtucker.net>
Wed, 17 Jul 2019 11:24:55 +0000 (21:24 +1000)
committerDarren Tucker <dtucker@dtucker.net>
Wed, 17 Jul 2019 11:24:55 +0000 (21:24 +1000)
Valgrind by default puts vgdb files and pipes under /tmp, however it
is not always able to clean them up, which can cause test failures when
there's a pid/file collision.  Using a specific directory ensures that
we can clean up and start clean.

regress/test-exec.sh

index 5394119bd795c9e0d86056d7a5b09f481c60b7e2..2744707614ef18baaa1d2c0efc0c7a151836fa28 100644 (file)
@@ -152,8 +152,8 @@ SFTPSERVER_BIN=${SFTPSERVER}
 SCP_BIN=${SCP}
 
 if [ "x$USE_VALGRIND" != "x" ]; then
-       mkdir -p $OBJ/valgrind-out
-       rm -f $OBJ/valgrind-out/*
+       rm -rf $OBJ/valgrind-out $OBJ/valgrind-vgdb
+       mkdir -p $OBJ/valgrind-out $OBJ/valgrind-vgdb
        # ensure agent low-priv tests can write logs.
        chmod 777 $OBJ/valgrind-out
        VG_TEST=`basename $SCRIPT .sh`
@@ -174,6 +174,7 @@ if [ "x$USE_VALGRIND" != "x" ]; then
                VG_OPTS="--track-origins=yes $VG_LEAK"
                VG_OPTS="$VG_OPTS --trace-children=yes"
                VG_OPTS="$VG_OPTS --trace-children-skip=${VG_IGNORE}"
+               VG_OPTS="$VG_OPTS --vgdb-prefix=$OBJ/valgrind-vgdb/"
                VG_PATH="valgrind"
                if [ "x$VALGRIND_PATH" != "x" ]; then
                        VG_PATH="$VALGRIND_PATH"