diff --git a/tests/expected/ipcs/limits b/tests/expected/ipcs/limits index 7480a1e27..7eaeff723 100644 --- a/tests/expected/ipcs/limits +++ b/tests/expected/ipcs/limits @@ -1,11 +1,7 @@ load original values +maximalize kernel setting 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 -/proc/sys/kernel/shmmni OK -/proc/sys/kernel/shmall OK -/proc/sys/kernel/shmmax OK write original values to kernel diff --git a/tests/ts/ipcs/functions.sh b/tests/ts/ipcs/functions.sh index 297d34f76..80c9416e7 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 851d4edfa..9048e4dbb 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"