tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix stderr tests on Windows

This commit is contained in:
Tess Gauthier 2023-08-29 10:14:40 -04:00
parent b2ec0cdd33
commit f7996c7a5c
1 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
regress/test-exec.sh
View File

@ -301,9 +301,11 @@ fi
# -qq is equivalent and is not removed. # -qq is equivalent and is not removed.
SSHLOGWRAP=$OBJ/ssh-log-wrapper.sh SSHLOGWRAP=$OBJ/ssh-log-wrapper.sh
# BALU todo - check if we need to pass -T flag # BALU todo - check if we need to pass -T flag
if [ "$os" == "windows" ]; then
# timestamp line messes up stderr-data.sh stderr-after-eof.sh,
# seems to be used for concurrency tests that Windows doesn't supported yet anyway
cat >$SSHLOGWRAP <<EOD cat >$SSHLOGWRAP <<EOD
#!/bin/sh #!/bin/sh
timestamp="\`$OBJ/timestamp\`"
logfile="${TEST_SSH_LOGDIR}/\${timestamp}.ssh.\$\$.log" logfile="${TEST_SSH_LOGDIR}/\${timestamp}.ssh.\$\$.log"
echo "Executing: ${SSH} \$@" log \${logfile} >>$TEST_REGRESS_LOGFILE echo "Executing: ${SSH} \$@" log \${logfile} >>$TEST_REGRESS_LOGFILE
echo "Executing: ${SSH} \$@" >>\${logfile} echo "Executing: ${SSH} \$@" >>\${logfile}
@ -312,6 +314,19 @@ rm -f $TEST_SSH_LOGFILE
ln -f -s \${logfile} $TEST_SSH_LOGFILE ln -f -s \${logfile} $TEST_SSH_LOGFILE
exec ${SSH} -E\${logfile} "\$@" exec ${SSH} -E\${logfile} "\$@"
EOD EOD
else
cat >$SSHLOGWRAP <<EOD
#!/bin/sh
#timestamp="\`$OBJ/timestamp\`"
logfile="${TEST_SSH_LOGDIR}/\${timestamp}.ssh.\$\$.log"
echo "Executing: ${SSH} \$@" log \${logfile} >>$TEST_REGRESS_LOGFILE
echo "Executing: ${SSH} \$@" >>\${logfile}
for i in "\$@";do shift;case "\$i" in -q):;; *) set -- "\$@" "\$i";;esac;done
rm -f $TEST_SSH_LOGFILE
ln -f -s \${logfile} $TEST_SSH_LOGFILE
exec ${SSH} -E\${logfile} "\$@"
EOD
fi
chmod a+rx $OBJ/ssh-log-wrapper.sh chmod a+rx $OBJ/ssh-log-wrapper.sh
REAL_SSH="$SSH" REAL_SSH="$SSH"