tests: extend TEST_NETLINK_OBJECT macro

[strace] / tests / qual_syscall.test

diff --git a/tests/qual_syscall.test b/tests/qual_syscall.test
index 4a29f5a5ef3911538926e1d7222959f9869e7178..1524405a316b6ac7d7a2d6abc591eb49f26e5ade 100755 (executable)
--- a/tests/qual_syscall.test
+++ b/tests/qual_syscall.test
@@ -5,19 +5,22 @@
 
 . "${srcdir=.}/init.sh"
 
-run_prog ./umovestr
-pattern_abbrev_verbose='execve("\./umovestr", \["\./umovestr"\], \[/\* [[:digit:]]* vars \*/\]) = 0'
-pattern_nonabbrev_verbose='execve("\./umovestr", \["\./umovestr"\], \[".*\"\]) = 0'
-pattern_nonverbose='execve("\./umovestr", 0x[[:xdigit:]]*, 0x[[:xdigit:]]*) = 0'
+run_prog ../umovestr
+pattern_abbrev_verbose='execve("\.\./umovestr", \["\.\./umovestr"\], 0x[[:xdigit:]]* /\* [[:digit:]]* vars \*/) = 0'
+pattern_nonabbrev_verbose='execve("\.\./umovestr", \["\.\./umovestr"\], \[".*\"\(\.\.\.\)\?\]) = 0'
+pattern_nonverbose='execve("\.\./umovestr", 0x[[:xdigit:]]*, 0x[[:xdigit:]]*) = 0'
 pattern_raw='execve(0x[[:xdigit:]]*, 0x[[:xdigit:]]*, 0x[[:xdigit:]]*) = 0'
 
 check_output_mismatch()
 {
        local pattern
        pattern="$1"; shift
-       run_strace "$@" ./umovestr
-       LC_ALL=C grep -x "$pattern" "$LOG" > /dev/null ||
+       run_strace "$@" ../umovestr
+       LC_ALL=C grep -x "$pattern" "$LOG" > /dev/null || {
+               printf '%s\n%s\n' \
+                       'Failed patterns of expected output:' "$pattern"
                dump_log_and_fail_with "$STRACE $args output mismatch"
+       }
 }
 
 check_output_mismatch "$pattern_abbrev_verbose" -e execve
@@ -25,15 +28,19 @@ LC_ALL=C grep -v -x "$pattern_abbrev_verbose" "$LOG" |
 LC_ALL=C grep '^[[:alnum:]_]*(' > /dev/null &&
        dump_log_and_fail_with "$STRACE $args unexpected output"
 
-check_output_mismatch "$pattern_abbrev_verbose" -e trace=process
+check_output_mismatch "$pattern_abbrev_verbose" -e trace=%process
 LC_ALL=C grep '^chdir' "$LOG" > /dev/null &&
        dump_log_and_fail_with "$STRACE $args unexpected output"
 
-run_strace -e 42 ./umovestr
+run_strace -e 42 ../umovestr
 LC_ALL=C grep '^[[:alnum:]_]*(' "$LOG" > /dev/null &&
        dump_log_and_fail_with "$STRACE $args unexpected output"
 
-for a in execve \!chdir all \!none \
+run_strace -e/ -e42 ../umovestr
+LC_ALL=C grep '^[[:alnum:]_]*(' "$LOG" > /dev/null &&
+       dump_log_and_fail_with "$STRACE $args unexpected output"
+
+for a in execve \!chdir /. all \!none \
         file process \!desc \!ipc \!memory \!network \!signal; do
        check_output_mismatch \
                "$pattern_abbrev_verbose" -e abbrev="$a" -e execve