tests: an attempt to get around https://github.com/karelzak/util-linux/issues/1110

Signed-off-by: Evgeny Vereshchagin <evvers@ya.ru>

diff --git a/tests/ts/ipcs/mk-rm-msg b/tests/ts/ipcs/mk-rm-msg
index a6c96acb68c136f0915462c34e610b882c4f045b..a9e2ca9db59a70e7ee129095e0e9c527d2a26f02 100755 (executable)
--- a/tests/ts/ipcs/mk-rm-msg
+++ b/tests/ts/ipcs/mk-rm-msg
@@ -35,7 +35,8 @@ 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
 
 rm -f $TS_OUTDIR/id-msg

diff --git a/tests/ts/ipcs/mk-rm-sem b/tests/ts/ipcs/mk-rm-sem
index 8cffe1fc972ed75db4d8d3d26c547759dc81ca80..ec59c0887297c168d867386639b789811f1b73c3 100755 (executable)
--- a/tests/ts/ipcs/mk-rm-sem
+++ b/tests/ts/ipcs/mk-rm-sem
@@ -35,7 +35,8 @@ $TS_CMD_IPCMK -S 2 2>>$TS_OUTPUT | ipcmk_output_handler $TS_OUTPUT $TS_OUTDIR/id
 $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}}'
+       awk -v id=$(cat $TS_OUTDIR/id-sem) '{if ($2 == id){print $1}}' |
+       uniq
 )" >> $TS_OUTPUT 2>> $TS_ERRLOG
 
 rm -f $TS_OUTDIR/id-sem

diff --git a/tests/ts/ipcs/mk-rm-shm b/tests/ts/ipcs/mk-rm-shm
index a3642647fb68b4417b49f0fa5845444ae47df5b3..eb85ad63fb61fea5bf024f9aa805e436e5b2bee3 100755 (executable)
--- a/tests/ts/ipcs/mk-rm-shm
+++ b/tests/ts/ipcs/mk-rm-shm
@@ -35,7 +35,8 @@ $TS_CMD_IPCMK -M 12 2>>$TS_OUTPUT | ipcmk_output_handler $TS_OUTPUT $TS_OUTDIR/i
 $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
 
 rm -f $TS_OUTDIR/id-shm