From 8671813cc7b9e59920b597e4370fbf6b0202d3cc Mon Sep 17 00:00:00 2001 From: Evgeny Vereshchagin Date: Tue, 28 Jul 2020 08:04:35 +0000 Subject: [PATCH] tests: an attempt to get around https://github.com/karelzak/util-linux/issues/1110 Signed-off-by: Evgeny Vereshchagin --- tests/ts/ipcs/mk-rm-msg | 3 ++- tests/ts/ipcs/mk-rm-sem | 3 ++- tests/ts/ipcs/mk-rm-shm | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/tests/ts/ipcs/mk-rm-msg b/tests/ts/ipcs/mk-rm-msg index a6c96acb68..a9e2ca9db5 100755 --- 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 8cffe1fc97..ec59c08872 100755 --- 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 a3642647fb..eb85ad63fb 100755 --- 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 -- 2.47.2