From 3a5f2d2ba2bfef6ce70da98a9eba06f2b57f4fb6 Mon Sep 17 00:00:00 2001 From: Ruediger Meier Date: Wed, 12 Mar 2014 20:03:06 +0100 Subject: [PATCH] tests: quote generated arguments for ipcrm In case that awk fails to parse out the right id the next ipc command will give us a clear error message instead of telling us to use correct syntax. Signed-off-by: Ruediger Meier --- tests/ts/ipcs/mk-rm-msg | 4 ++-- tests/ts/ipcs/mk-rm-sem | 4 ++-- tests/ts/ipcs/mk-rm-shm | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/ts/ipcs/mk-rm-msg b/tests/ts/ipcs/mk-rm-msg index 72f89b8a15..2aaa3af9b9 100755 --- a/tests/ts/ipcs/mk-rm-msg +++ b/tests/ts/ipcs/mk-rm-msg @@ -30,10 +30,10 @@ $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 3152618743..bae4bb10e7 100755 --- a/tests/ts/ipcs/mk-rm-sem +++ b/tests/ts/ipcs/mk-rm-sem @@ -30,10 +30,10 @@ $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_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 9695ed17cd..11fb3d1826 100755 --- a/tests/ts/ipcs/mk-rm-shm +++ b/tests/ts/ipcs/mk-rm-shm @@ -30,10 +30,10 @@ $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_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 -- 2.47.3