diff options
| author | Eugene Syromyatnikov <evgsyr@gmail.com> | 2020-04-14 03:46:23 +0200 |
|---|---|---|
| committer | Dmitry V. Levin <ldv@altlinux.org> | 2020-04-15 13:39:57 +0000 |
| commit | b88ba121e9179d536ff5cd29606b13b52d49dd7d (patch) | |
| tree | f8afdf27822d621aa3b5bfd12ecf251bf6ed8721 | |
| parent | 52d4ba9c3213011b0d0280e9b8840a4a96eb01b4 (diff) | |
| download | strace-b88ba121e9179d536ff5cd29606b13b52d49dd7d.tar.gz | |
tests: allow passing arguments to netlink_sock_diag.test
And remove netlink_sock_diag-v.sh, since it is no longer needed.
* tests/netlink_sock_diag.test: Pass script's arguments to
run_strace_match_diff call.
* tests/gen_tests.in (nlattr_packet_diag_msg): Call
netlink_sock_diag.test with -v instead of netlink_sock_diag-v.sh..
* tests/netlink_sock_diag-v.sh: Remove.
* tests/Makefile.am (EXTRA_DIST): Remove netlink_sock_diag-v.sh.
| -rw-r--r-- | tests/Makefile.am | 1 | ||||
| -rw-r--r-- | tests/gen_tests.in | 2 | ||||
| -rwxr-xr-x | tests/netlink_sock_diag-v.sh | 13 | ||||
| -rwxr-xr-x | tests/netlink_sock_diag.test | 2 |
4 files changed, 2 insertions, 16 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am index 93222429d..18bd5f7fe 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -477,7 +477,6 @@ EXTRA_DIST = \ lstatx.c \ match.awk \ net.expected \ - netlink_sock_diag-v.sh \ nlattr_ifla.h \ pipe.expected \ print_user_desc.c \ diff --git a/tests/gen_tests.in b/tests/gen_tests.in index ed0fffa1d..8949acded 100644 --- a/tests/gen_tests.in +++ b/tests/gen_tests.in @@ -387,7 +387,7 @@ nlattr_ndtmsg +netlink_sock_diag.test nlattr_netconfmsg +netlink_sock_diag.test nlattr_netlink_diag_msg +netlink_sock_diag.test nlattr_nlmsgerr +netlink_sock_diag.test -nlattr_packet_diag_msg +netlink_sock_diag-v.sh +nlattr_packet_diag_msg +netlink_sock_diag.test -v nlattr_rtgenmsg +netlink_sock_diag.test nlattr_rtmsg +netlink_sock_diag.test nlattr_smc_diag_msg +netlink_sock_diag.test diff --git a/tests/netlink_sock_diag-v.sh b/tests/netlink_sock_diag-v.sh deleted file mode 100755 index 0fb467dbf..000000000 --- a/tests/netlink_sock_diag-v.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/sh -# -# Check verbose decoding of NETLINK_SOCK_DIAG protocol -# -# Copyright (c) 2017-2018 The strace developers. -# All rights reserved. -# -# SPDX-License-Identifier: GPL-2.0-or-later - -. "${srcdir=.}/init.sh" - -run_prog ../netlink_netlink_diag -run_strace_match_diff -v -e trace=sendto diff --git a/tests/netlink_sock_diag.test b/tests/netlink_sock_diag.test index d5fb977b5..4cb2e38f0 100755 --- a/tests/netlink_sock_diag.test +++ b/tests/netlink_sock_diag.test @@ -10,4 +10,4 @@ . "${srcdir=.}/init.sh" run_prog ../netlink_netlink_diag -run_strace_match_diff -e trace=sendto +run_strace_match_diff -e trace=sendto "$@" |