tests: (ipcs) use long options to improve test coverage report

Signed-off-by: Christian Goeschel Ndjomouo <cgoesc2@wgu.edu>

diff --git a/tests/ts/ipcs/headers b/tests/ts/ipcs/headers
index 2796f4b0abe692b8f14f13fd8af8afefada6f50a..d01424ef45b12efa501a2b7353e7a0ff69cd85fb 100755 (executable)
--- a/tests/ts/ipcs/headers
+++ b/tests/ts/ipcs/headers
@@ -3,7 +3,7 @@
 #
 # Copyright (C) 2007 Karel Zak <kzak@redhat.com>
 #
-# This file is part of util-linux.
+# This file is part of util--limitsinux.
 #
 # This file is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -24,37 +24,37 @@ ts_init "$*"
 ts_check_test_command "$TS_CMD_IPCS"
 
 ts_init_subtest "shm-headers"
-$TS_CMD_IPCS -m -t | grep -A1 "^---"  >> $TS_OUTPUT 2>> $TS_ERRLOG
-$TS_CMD_IPCS -m -p | grep -A1 "^---"  >> $TS_OUTPUT 2>> $TS_ERRLOG
-$TS_CMD_IPCS -m -c | grep -A1 "^---"  >> $TS_OUTPUT 2>> $TS_ERRLOG
-$TS_CMD_IPCS -m -l | grep "^---"  >> $TS_OUTPUT 2>> $TS_ERRLOG
-$TS_CMD_IPCS -m -u | grep "^---"  >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_IPCS --shmems --time | grep -A1 "^---"  >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_IPCS --shmems --pid | grep -A1 "^---"  >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_IPCS --shmems --creator | grep -A1 "^---"  >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_IPCS --shmems --limits | grep "^---"  >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_IPCS --shmems --summary | grep "^---"  >> $TS_OUTPUT 2>> $TS_ERRLOG
 ts_finalize_subtest
 
 ts_init_subtest "mesg-headers"
-$TS_CMD_IPCS -q -t | grep -A1 "^---"  >> $TS_OUTPUT 2>> $TS_ERRLOG
-$TS_CMD_IPCS -q -p | grep -A1 "^---"  >> $TS_OUTPUT 2>> $TS_ERRLOG
-$TS_CMD_IPCS -q -c | grep -A1 "^---"  >> $TS_OUTPUT 2>> $TS_ERRLOG
-$TS_CMD_IPCS -q -l | grep  "^---"  >> $TS_OUTPUT 2>> $TS_ERRLOG
-$TS_CMD_IPCS -q -u | grep  "^---"  >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_IPCS --queues --time | grep -A1 "^---"  >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_IPCS --queues --pid | grep -A1 "^---"  >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_IPCS --queues --creator | grep -A1 "^---"  >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_IPCS --queues --limits | grep  "^---"  >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_IPCS --queues --summary | grep  "^---"  >> $TS_OUTPUT 2>> $TS_ERRLOG
 ts_finalize_subtest
 
 ts_init_subtest "sem-headers"
-$TS_CMD_IPCS -s -t | grep -A1 "^---"  >> $TS_OUTPUT 2>> $TS_ERRLOG
-$TS_CMD_IPCS -s -p | grep -A1 "^---"  >> $TS_OUTPUT 2>> $TS_ERRLOG
-$TS_CMD_IPCS -s -c | grep -A1 "^---"  >> $TS_OUTPUT 2>> $TS_ERRLOG
-$TS_CMD_IPCS -s -l | grep  "^---"  >> $TS_OUTPUT 2>> $TS_ERRLOG
-$TS_CMD_IPCS -s -u | grep  "^---"  >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_IPCS --semaphores --time | grep -A1 "^---"  >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_IPCS --semaphores --pid | grep -A1 "^---"  >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_IPCS --semaphores --creator | grep -A1 "^---"  >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_IPCS --semaphores --limits | grep  "^---"  >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_IPCS --semaphores --summary | grep  "^---"  >> $TS_OUTPUT 2>> $TS_ERRLOG
 ts_finalize_subtest
 
 ts_init_subtest "all-headers"
-$TS_CMD_IPCS -a | grep -A1 "^---"  >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_IPCS --all | grep -A1 "^---"  >> $TS_OUTPUT 2>> $TS_ERRLOG
 
-$TS_CMD_IPCS -a -t | grep -A1 "^---"  >> $TS_OUTPUT 2>> $TS_ERRLOG
-$TS_CMD_IPCS -a -p | grep -A1 "^---"  >> $TS_OUTPUT 2>> $TS_ERRLOG
-$TS_CMD_IPCS -a -c | grep -A1 "^---"  >> $TS_OUTPUT 2>> $TS_ERRLOG
-$TS_CMD_IPCS -a -l | grep "^---"  >> $TS_OUTPUT 2>> $TS_ERRLOG
-$TS_CMD_IPCS -a -u | grep "^---"  >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_IPCS --all --time | grep -A1 "^---"  >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_IPCS --all --pid | grep -A1 "^---"  >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_IPCS --all --creator | grep -A1 "^---"  >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_IPCS --all --limits | grep "^---"  >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_IPCS --all --summary | grep "^---"  >> $TS_OUTPUT 2>> $TS_ERRLOG
 ts_finalize_subtest
 
 ts_finalize

diff --git a/tests/ts/ipcs/mk-rm-msg b/tests/ts/ipcs/mk-rm-msg
index c588a0dc2f14125cd8604705d438a5a1eb44d6d6..c158f0c5d068b3d43e335f5010e6b87c6fa5b362 100755 (executable)
--- a/tests/ts/ipcs/mk-rm-msg
+++ b/tests/ts/ipcs/mk-rm-msg
@@ -29,13 +29,13 @@ rm -f $TS_OUTDIR/id-msg
 $TS_CMD_IPCMK -Q 2>>$TS_OUTPUT | ipcmk_output_handler $TS_OUTPUT $TS_OUTDIR/id-msg
 $TS_CMD_IPCS -q -i "$(cat $TS_OUTDIR/id-msg)" |\
        grep -c "^Message Queue msqid=$(cat $TS_OUTDIR/id-msg)$" >>$TS_OUTPUT
-$TS_CMD_IPCRM -q $(cat $TS_OUTDIR/id-msg) >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_IPCRM -q "$(cat $TS_OUTDIR/id-msg)" >> $TS_OUTPUT 2>> $TS_ERRLOG
 
 rm -f $TS_OUTDIR/id-msg
 $TS_CMD_IPCMK -Q 2>>$TS_OUTPUT | ipcmk_output_handler $TS_OUTPUT $TS_OUTDIR/id-msg
 $TS_CMD_IPCRM -Q "$(
        $TS_CMD_IPCS -q |
-       awk -v id=$(cat $TS_OUTDIR/id-msg) '{if ($2 == id){print $1}}' |
+       awk -v id="$(cat $TS_OUTDIR/id-msg)" '{if ($2 == id){print $1}}' |
        uniq
 )" >> $TS_OUTPUT 2>> $TS_ERRLOG
 

diff --git a/tests/ts/ipcs/mk-rm-shm b/tests/ts/ipcs/mk-rm-shm
index 81f40cf4771b15c7a96db0d2fd3b642c64e5682d..7fd53107f2ef683fb833bf4e281cce5b7adce058 100755 (executable)
--- a/tests/ts/ipcs/mk-rm-shm
+++ b/tests/ts/ipcs/mk-rm-shm
@@ -28,14 +28,14 @@ ts_check_test_command "$TS_HELPER_SYSINFO"
 rm -f $TS_OUTDIR/id-shm
 $TS_CMD_IPCMK -M 1 2>>$TS_OUTPUT | ipcmk_output_handler $TS_OUTPUT $TS_OUTDIR/id-shm
 $TS_CMD_IPCS -m -i "$(cat $TS_OUTDIR/id-shm)" | sed -n '/^bytes/s/\t.*//p' >>$TS_OUTPUT
-$TS_CMD_IPCRM -m $(cat $TS_OUTDIR/id-shm) >> $TS_OUTPUT 2>> $TS_ERRLOG
+$TS_CMD_IPCRM -m "$(cat $TS_OUTDIR/id-shm)" >> $TS_OUTPUT 2>> $TS_ERRLOG
 rm -f $TS_OUTDIR/id-shm
 
 $TS_CMD_IPCMK -M 12 2>>$TS_OUTPUT | ipcmk_output_handler $TS_OUTPUT $TS_OUTDIR/id-shm
 $TS_CMD_IPCS -m -i "$(cat $TS_OUTDIR/id-shm)" | sed -n '/^bytes/s/\t.*//p' >>$TS_OUTPUT
 $TS_CMD_IPCRM -M "$(
        $TS_CMD_IPCS -m |
-       awk -v id=$(cat $TS_OUTDIR/id-shm) '{if ($2 == id){print $1}}' |
+       awk -v id="$(cat $TS_OUTDIR/id-shm)" '{if ($2 == id){print $1}}' |
        uniq
 )" >> $TS_OUTPUT 2>> $TS_ERRLOG