6 files changed, 19 insertions, 8 deletions
diff --git a/tests/expected/ipcs/mk-rm-msg b/tests/expected/ipcs/mk-rm-msg
index 8a82b9470..a913bc36b 100644
--- a/tests/expected/ipcs/mk-rm-msg
+++ b/tests/expected/ipcs/mk-rm-msg
@@ -1,2 +1,3 @@
 Message queue id: <was_number>
+1
 Message queue id: <was_number>
diff --git a/tests/expected/ipcs/mk-rm-sem b/tests/expected/ipcs/mk-rm-sem
index a9c3f469c..da2c7cd0c 100644
--- a/tests/expected/ipcs/mk-rm-sem
+++ b/tests/expected/ipcs/mk-rm-sem
@@ -1,2 +1,4 @@
 Semaphore id: <was_number>
+nsems = 1
 Semaphore id: <was_number>
+nsems = 2
diff --git a/tests/expected/ipcs/mk-rm-shm b/tests/expected/ipcs/mk-rm-shm
index 49d586728..c63ab4687 100644
--- a/tests/expected/ipcs/mk-rm-shm
+++ b/tests/expected/ipcs/mk-rm-shm
@@ -1,2 +1,4 @@
 Shared memory id: <was_number>
+bytes=1
 Shared memory id: <was_number>
+bytes=12
diff --git a/tests/ts/ipcs/mk-rm-msg b/tests/ts/ipcs/mk-rm-msg
index 72f89b8a1..25460e25d 100755
--- a/tests/ts/ipcs/mk-rm-msg
+++ b/tests/ts/ipcs/mk-rm-msg
@@ -26,14 +26,16 @@ ts_check_test_command "$TS_CMD_IPCRM"
 
 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>&1
 
 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_IPCRM -Q "$(
 	$TS_CMD_IPCS -q |
 	awk -v id=$(cat $TS_OUTDIR/id-msg) '{if ($2 == id){print $1}}'
-) >>$TS_OUTPUT 2>&1
+)" >>$TS_OUTPUT 2>&1
 
 rm -f $TS_OUTDIR/id-msg
 
diff --git a/tests/ts/ipcs/mk-rm-sem b/tests/ts/ipcs/mk-rm-sem
index 315261874..61e0cfdef 100755
--- a/tests/ts/ipcs/mk-rm-sem
+++ b/tests/ts/ipcs/mk-rm-sem
@@ -26,14 +26,16 @@ ts_check_test_command "$TS_CMD_IPCRM"
 
 rm -f $TS_OUTDIR/id-sem
 $TS_CMD_IPCMK -S 1 2>>$TS_OUTPUT | ipcmk_output_handler $TS_OUTPUT $TS_OUTDIR/id-sem
+$TS_CMD_IPCS -s -i "$(cat $TS_OUTDIR/id-sem)" | grep "^nsems" >>$TS_OUTPUT
 $TS_CMD_IPCRM -s $(cat $TS_OUTDIR/id-sem) >>$TS_OUTPUT 2>&1
 
 rm -f $TS_OUTDIR/id-sem
-$TS_CMD_IPCMK -S 1 2>>$TS_OUTPUT | ipcmk_output_handler $TS_OUTPUT $TS_OUTDIR/id-sem
-$TS_CMD_IPCRM -S $(
+$TS_CMD_IPCMK -S 2 2>>$TS_OUTPUT | ipcmk_output_handler $TS_OUTPUT $TS_OUTDIR/id-sem
+$TS_CMD_IPCS -s -i "$(cat $TS_OUTDIR/id-sem)" | grep "^nsems" >>$TS_OUTPUT
+$TS_CMD_IPCRM -S "$(
 	$TS_CMD_IPCS -s |
 	awk -v id=$(cat $TS_OUTDIR/id-sem) '{if ($2 == id){print $1}}'
-) >>$TS_OUTPUT 2>&1
+)" >>$TS_OUTPUT 2>&1
 
 rm -f $TS_OUTDIR/id-sem
 
diff --git a/tests/ts/ipcs/mk-rm-shm b/tests/ts/ipcs/mk-rm-shm
index 9695ed17c..838fb3f21 100755
--- a/tests/ts/ipcs/mk-rm-shm
+++ b/tests/ts/ipcs/mk-rm-shm
@@ -26,14 +26,16 @@ ts_check_test_command "$TS_CMD_IPCRM"
 
 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>&1
 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_IPCRM -M $(
+$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}}'
-) >>$TS_OUTPUT 2>&1
+)" >>$TS_OUTPUT 2>&1
 
 rm -f $TS_OUTDIR/id-shm