1 files changed, 43 insertions, 8 deletions

diff --git a/regress/test-exec.sh b/regress/test-exec.sh
index b8e2009de..508b93284 100644
--- a/regress/test-exec.sh
+++ b/regress/test-exec.sh
@@ -1,4 +1,4 @@
-#       $OpenBSD: test-exec.sh,v 1.65 2019/01/27 06:30:53 dtucker Exp $
+#       $OpenBSD: test-exec.sh,v 1.66 2019/07/05 04:12:46 dtucker Exp $
 #       Placed in the Public Domain.
 
 #SUDO=sudo
@@ -152,13 +152,22 @@ SFTPSERVER_BIN=${SFTPSERVER}
 SCP_BIN=${SCP}
 
 if [ "x$USE_VALGRIND" != "x" ]; then
-        mkdir -p $OBJ/valgrind-out
+        rm -rf $OBJ/valgrind-out $OBJ/valgrind-vgdb
+        mkdir -p $OBJ/valgrind-out $OBJ/valgrind-vgdb
+        # When using sudo ensure low-priv tests can write pipes and logs.
+        if [ "x$SUDO" != "x" ]; then
+                chmod 777 $OBJ/valgrind-out $OBJ/valgrind-vgdb
+        fi
         VG_TEST=`basename $SCRIPT .sh`
 
         # Some tests are difficult to fix.
         case "$VG_TEST" in
-        connect-privsep|reexec)
+        reexec)
                 VG_SKIP=1 ;;
+        sftp-chroot)
+                if [ "x${SUDO}" != "x" ]; then
+                        VG_SKIP=1
+                fi ;;
         esac
 
         if [ x"$VG_SKIP" = "x" ]; then
@@ -171,6 +180,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"
@@ -527,13 +537,13 @@ if test "$REGRESS_INTEROP_PUTTY" = "yes" ; then
             >> $OBJ/authorized_keys_$USER
 
         # Convert rsa2 host key to PuTTY format
-        cp $OBJ/rsa $OBJ/rsa_oldfmt
-        ${SSHKEYGEN} -p -N '' -m PEM -f $OBJ/rsa_oldfmt >/dev/null
-        ${SRC}/ssh2putty.sh 127.0.0.1 $PORT $OBJ/rsa_oldfmt > \
+        cp $OBJ/ssh-rsa $OBJ/ssh-rsa_oldfmt
+        ${SSHKEYGEN} -p -N '' -m PEM -f $OBJ/ssh-rsa_oldfmt >/dev/null
+        ${SRC}/ssh2putty.sh 127.0.0.1 $PORT $OBJ/ssh-rsa_oldfmt > \
             ${OBJ}/.putty/sshhostkeys
-        ${SRC}/ssh2putty.sh 127.0.0.1 22 $OBJ/rsa_oldfmt >> \
+        ${SRC}/ssh2putty.sh 127.0.0.1 22 $OBJ/ssh-rsa_oldfmt >> \
             ${OBJ}/.putty/sshhostkeys
-        rm -f $OBJ/rsa_oldfmt
+        rm -f $OBJ/ssh-rsa_oldfmt
 
         # Setup proxied session
         mkdir -p ${OBJ}/.putty/sessions
@@ -581,6 +591,31 @@ start_sshd ()
 
 # kill sshd
 cleanup
+
+if [ "x$USE_VALGRIND" != "x" ]; then
+        # wait for any running process to complete
+        wait; sleep 1
+        VG_RESULTS=$(find $OBJ/valgrind-out -type f -print)
+        VG_RESULT_COUNT=0
+        VG_FAIL_COUNT=0
+        for i in $VG_RESULTS; do
+                if grep "ERROR SUMMARY" $i >/dev/null; then
+                        VG_RESULT_COUNT=$(($VG_RESULT_COUNT + 1))
+                        if ! grep "ERROR SUMMARY: 0 errors" $i >/dev/null; then
+                                VG_FAIL_COUNT=$(($VG_FAIL_COUNT + 1))
+                                RESULT=1
+                                verbose valgrind failure $i
+                                cat $i
+                        fi
+                fi
+        done
+        if [ x"$VG_SKIP" != "x" ]; then
+                verbose valgrind skipped
+        else
+                verbose valgrind results $VG_RESULT_COUNT failures $VG_FAIL_COUNT
+        fi
+fi
+
 if [ $RESULT -eq 0 ]; then
         verbose ok $tid
 else