Module Name: src
Committed By: jmmv
Date: Tue Mar 29 16:03:32 UTC 2011
Modified Files:
src/tests/lib/librumphijack: t_tcpip.sh
Log Message:
Halt the httpd server _before_ rump. Per pooka@'s suggestion.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/tests/lib/librumphijack/t_tcpip.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/lib/librumphijack/t_tcpip.sh
diff -u src/tests/lib/librumphijack/t_tcpip.sh:1.9 src/tests/lib/librumphijack/t_tcpip.sh:1.10
--- src/tests/lib/librumphijack/t_tcpip.sh:1.9 Tue Mar 29 15:43:45 2011
+++ src/tests/lib/librumphijack/t_tcpip.sh Tue Mar 29 16:03:32 2011
@@ -1,4 +1,4 @@
-# $NetBSD: t_tcpip.sh,v 1.9 2011/03/29 15:43:45 jmmv Exp $
+# $NetBSD: t_tcpip.sh,v 1.10 2011/03/29 16:03:32 jmmv Exp $
#
# Copyright (c) 2011 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -59,12 +59,12 @@
http_cleanup()
{
- rump.halt
-
if [ -f httpd.pid ]; then
kill -9 "$(cat httpd.pid)"
rm -f httpd.pid
fi
+
+ rump.halt
}
#
