From 19ff2b2ee778718b2600d02031a22974199db593 Mon Sep 17 00:00:00 2001 From: "Dmitry V. Levin" Date: Sat, 9 Jan 2016 01:36:54 +0000 Subject: [PATCH] ioctl.test: robustify against libcs invoking ioctl syscall on their own * tests/ioctl.test: Filter out from the log ioctl calls with standard descriptor arguments. Reported-by: Szabolcs Nagy --- tests/ioctl.test | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/tests/ioctl.test b/tests/ioctl.test index 7b3e3fd7..152d1056 100755 --- a/tests/ioctl.test +++ b/tests/ioctl.test @@ -4,10 +4,15 @@ . "${srcdir=.}/init.sh" -run_prog > /dev/null OUT="$LOG.out" -run_strace -a16 -e ioctl $args > "$OUT" -match_diff "$LOG" "$OUT" -rm -f "$OUT" +EXP="$LOG.exp" + +run_prog > /dev/null +run_strace -a16 -eioctl $args > "$EXP" +check_prog grep +grep -v '^ioctl([012],' < "$LOG" > "$OUT" +match_diff "$OUT" "$EXP" + +rm -f "$EXP" "$OUT" exit 0 -- 2.40.0