test/nfs: correct return code and cleanup

diff --git a/test/TEST-20-NFS/test.sh b/test/TEST-20-NFS/test.sh
index 62aa02ce743244dd33758b751616332291f884c0..530a42c312125cdb491d1485b248803c8b74f897 100755 (executable)
--- 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() {