From: David van Moolenbroek <david@minix3.org>
Date: Wed, 15 Jul 2015 08:47:45 +0000 (+0200)
Subject: tests: remove VM exceptions from testrelpol.sh
X-Git-Url: http://zhaoyanbai.com/repos/cppcheck-error.log?a=commitdiff_plain;h=refs%2Fchanges%2F56%2F3156%2F1;p=minix.git

tests: remove VM exceptions from testrelpol.sh

Change-Id: Ied1db7e77d1849ecb5e92fe9694bb395983c6122
---

diff --git a/minix/tests/testrelpol.sh b/minix/tests/testrelpol.sh
index 3201c3c4e..9b19cf6fb 100755
--- 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