From: Karel Zak <kzak@redhat.com>
Date: Fri, 19 Dec 2014 12:36:07 +0000 (+0100)
Subject: tests: don't check the current ipcs limits
X-Git-Tag: v2.26-rc1~114
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7ef338f39de0d9661e5a0e234b89e46546b21e22;p=thirdparty%2Futil-linux.git

tests: don't check the current ipcs limits

The ipcs/limit test checks the current kernel limits, but we have no
clue about the current setting, so on on 64bit system it may overflow.

It's better to test for well known limits only. For the random setting
is there ipcs/limit2 test.

Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/tests/expected/ipcs/limits b/tests/expected/ipcs/limits
index 7480a1e271..7eaeff723a 100644
--- a/tests/expected/ipcs/limits
+++ b/tests/expected/ipcs/limits
@@ -1,10 +1,6 @@
 load original values
-check for difference between kernel and IPC
-/proc/sys/kernel/shmmni OK
-/proc/sys/kernel/shmall OK
-/proc/sys/kernel/shmmax OK
 maximalize kernel setting
-re-check for difference between kernel and IPC
+check for difference between kernel and IPC
 /proc/sys/kernel/shmmni OK
 /proc/sys/kernel/shmall OK
 /proc/sys/kernel/shmmax OK
diff --git a/tests/ts/ipcs/functions.sh b/tests/ts/ipcs/functions.sh
index 297d34f765..80c9416e77 100644
--- a/tests/ts/ipcs/functions.sh
+++ b/tests/ts/ipcs/functions.sh
@@ -64,14 +64,17 @@ IPCS_IDX=$(seq 0 $(( ${#IPCS_PROCFILES[*]} - 1 )))
 # checker
 function ipcs_limits_check {
 	for i in $IPCS_IDX; do
+
 		echo -n ${IPCS_PROCFILES[$i]}
 
 		a=$(eval ${IPCS_KERNEL_CMD[$i]})
 		b=$(eval ${IPCS_CMD[$i]})
 
-		#echo -n " RAW: "
-		#cat ${IPCS_PROCFILES[$i]}
-		#echo "CMD: ${ICPS_KERNEL_CMD[$i]}"
+		#echo
+		#echo "KERNEL-CMD: ${IPCS_KERNEL_CMD[$i]}"
+		#echo "KERNEL-RAW: $(cat ${IPCS_PROCFILES[$i]})"
+		#echo "IPCS-CMD:   ${IPCS_CMD[$i]}"
+		#echo
 
 		if [ x"$a" == x"$b" ]; then
 			echo " OK"
diff --git a/tests/ts/ipcs/limits b/tests/ts/ipcs/limits
index 851d4edfaa..9048e4dbbe 100755
--- a/tests/ts/ipcs/limits
+++ b/tests/ts/ipcs/limits
@@ -35,15 +35,12 @@ for i in $IPCS_IDX; do
 	SHM_ORG[$i]=$(cat ${IPCS_PROCFILES[$i]})
 done >> $TS_OUTPUT
 
-ts_log "check for difference between kernel and IPC"
-ipcs_limits_check >> $TS_OUTPUT
-
 ts_log "maximalize kernel setting"
 for i in $IPCS_IDX; do
 	echo ${IPCS_LIMITS[$i]} >> ${IPCS_PROCFILES[$i]}
 done >> $TS_OUTPUT
 
-ts_log "re-check for difference between kernel and IPC"
+ts_log "check for difference between kernel and IPC"
 ipcs_limits_check >> $TS_OUTPUT
 
 ts_log "write original values to kernel"