From: Harald Hoyer <harald@redhat.com>
Date: Mon, 26 Oct 2009 14:35:42 +0000 (+0100)
Subject: test/TEST-20-NFS: kill server if pid file present on run()
X-Git-Tag: 003~85
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2cc8cbeaf4bb0d70e57b0be86062b16c1e4729c6;p=thirdparty%2Fdracut.git

test/TEST-20-NFS: kill server if pid file present on run()
---

diff --git a/test/TEST-20-NFS/test.sh b/test/TEST-20-NFS/test.sh
index ad8e22d62..040dff6ec 100755
--- a/test/TEST-20-NFS/test.sh
+++ b/test/TEST-20-NFS/test.sh
@@ -168,6 +168,11 @@ test_nfsv4() {
 }
 
 test_run() {
+    if [[ -s server.pid ]]; then
+	sudo kill -TERM $(cat server.pid)
+	rm -f server.pid
+    fi
+
     if ! run_server; then
 	echo "Failed to start server" 1>&2
 	return 1