test/nfs: correct return code and cleanup

2010-04-16 16:56:18 +02:00 · 2010-04-16 16:56:18 +02:00 · 3de984ba7f
parent 85fd75f91f
commit 3de984ba7f
1 changed files with 7 additions and 2 deletions
--- 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() {