From: Harald Hoyer <harald@redhat.com>
Date: Fri, 16 Apr 2010 14:56:18 +0000 (+0200)
Subject: test/nfs: correct return code and cleanup
X-Git-Tag: 006~55
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3de984ba7f14bea072322016e5edc1817d979ea7;p=thirdparty%2Fdracut.git

test/nfs: correct return code and cleanup
---

diff --git a/test/TEST-20-NFS/test.sh b/test/TEST-20-NFS/test.sh
index 62aa02ce7..530a42c31 100755
--- a/test/TEST-20-NFS/test.sh
+++ b/test/TEST-20-NFS/test.sh
@@ -178,12 +178,17 @@ test_run() {
 	return 1
     fi
 
-    test_nfsv3 || return 1
-    test_nfsv4
+    test_nfsv3 && \
+	test_nfsv4
+
+    ret=$?
+
     if [[ -s server.pid ]]; then
 	sudo kill -TERM $(cat server.pid)
 	rm -f server.pid
     fi
+
+    return $ret
 }
 
 test_setup() {