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 7480a1e27186df10fdaa64038ad3b6ab48980872..7eaeff723a23eda7f095f20a18b7a1eb794a9b79 100644 (file)
--- 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 297d34f765f0c94fbef8ed7ed1800861bb31d3a4..80c9416e77983e7f99af9699aca251de0682d83b 100644 (file)
--- 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 851d4edfaaec63aca5da3abd80b299d77af563bb..9048e4dbbeb4ec7aa7f0368757da9823935efb73 100755 (executable)
--- 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"