From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Date: Sun, 26 Oct 2008 05:23:21 +0000 (-0400)
Subject: testing switching back to SSHD_PID, since the jobspec does not seem to work through... 
X-Git-Tag: monkeysphere_0.16-1~9
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=485b28a03e3f53361a4084921b1d3c68c0fda968;p=monkeysphere.git

testing switching back to SSHD_PID, since the jobspec does not seem to work through a trap.
---

diff --git a/tests/basic b/tests/basic
index a917f9f..a04cc0e 100755
--- a/tests/basic
+++ b/tests/basic
@@ -26,9 +26,9 @@ cleanup() {
     echo
     read -p "press enter to cleanup and remove tmp:"
 
-    if ( jobs %1 >/dev/null 2>/dev/null ) ; then 
+    if ( ps $SSHD_PID >/dev/null ) ; then 
 	echo "### stopping still-running sshd..."
-	kill %1
+	kill $SSHD_PID
     fi
 
     echo "### removing temp dir..."
@@ -124,6 +124,7 @@ EOF
 # launch test sshd with the new host key.
 echo "### starting sshd..."
 socat EXEC:"/usr/sbin/sshd -f ${SSHD_CONFIG} -i -d -d -d -D -e" "UNIX-LISTEN:${SOCKET}" 2> "$TEMPDIR"/sshd.log &
+export SSHD_PID=$!
 
 ### TESTUSER TESTS