tests: remove VM exceptions from testrelpol.sh

Change-Id: Ied1db7e77d1849ecb5e92fe9694bb395983c6122

diff --git a/minix/tests/testrelpol.sh b/minix/tests/testrelpol.sh
index 3201c3c4ec1caa940fb9cc4f64140b9216517a44..9b19cf6fbdbb173d266bde266f4643ed9c7fca6a 100755 (executable)
--- a/minix/tests/testrelpol.sh
+++ b/minix/tests/testrelpol.sh
@@ -197,19 +197,16 @@ lu_test() {
        fi
 
        # Test live update initialization crash
-       if ! echo "vm" | grep -q ${label}
-       then
-               lu_opts="-x" lu_test_one ${label} self 200 || return
-       fi
+       lu_opts="-x" lu_test_one ${label} self 200 || return
 
        # Test live update initialization failure
-       if ! echo "rs vm" | grep -q ${label}
+       if ! echo "rs" | grep -q ${label}
        then
                lu_opts="-y" lu_test_one ${label} self 78 || return
        fi
 
        # Test live update initialization timeout
-       if ! echo "rs vm" | grep -q ${label}
+       if ! echo "rs" | grep -q ${label}
        then
                lu_maxtime="1HZ" lu_opts="-z" lu_test_one ${label} self 4 || return
        fi
@@ -249,14 +246,6 @@ multi_lu_test_one() {
        do
                index=`expr $index + 1`
 
-               if [ "x$label" = "xvm" ]
-               then
-                       if echo "${lu_opts_once}" | grep -q -E -- '-(x|y|z)'
-                       then
-                               continue
-                       fi
-               fi
-
                if [ $index -eq $once_index ]
                then
                        service ${lu_opts_once} -q update self -label ${label} -maxtime ${lu_maxtime_once} -state ${lu_state_once} || ret=1