]> granicus.if.org Git - strace/commitdiff
ioctl.test: robustify against libcs invoking ioctl syscall on their own
authorDmitry V. Levin <ldv@altlinux.org>
Sat, 9 Jan 2016 01:36:54 +0000 (01:36 +0000)
committerDmitry V. Levin <ldv@altlinux.org>
Sat, 9 Jan 2016 01:44:19 +0000 (01:44 +0000)
* tests/ioctl.test: Filter out from the log ioctl calls with standard
descriptor arguments.

Reported-by: Szabolcs Nagy <nsz@port70.net>
tests/ioctl.test

index 7b3e3fd7b37f99332a699b06656b78f9d7cc8b2a..152d1056f729aae2854f69fc7c72325ed319c632 100755 (executable)
@@ -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