[PATCH v2 net-next] tools: testing: selftests: prefer TEST_PROGS for conntrack_dump_flush

[PATCH v2 net-next] tools: testing: selftests: prefer TEST_PROGS for conntrack_dump_flush

[Florian Westphal]

Currently conntrack_dump_flush test program always runs when passing
TEST_PROGS argument:

% make -C tools/testing/selftests TARGETS=net/netfilter \
 TEST_PROGS=conntrack_ipip_mtu.sh run_tests
make: Entering [..]
TAP version 13
1..2 [..]
  selftests: net/netfilter: conntrack_dump_flush [..]

Move away from TEST_CUSTOM_PROGS to avoid this.  After this,
above command will only run the program specified in TEST_PROGS.

Link: https://lore.kernel.org/netdev/20240423191609.70c14c42@kernel.org/
Signed-off-by: Florian Westphal <fw@strlen.de>
---
 v2: use TEST_GEN_PROGS instead of TEST_PROGS+.sh wrapper

 tools/testing/selftests/net/netfilter/Makefile | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/tools/testing/selftests/net/netfilter/Makefile b/tools/testing/selftests/net/netfilter/Makefile
index 68e4780edfdc..72c6001964a6 100644
--- a/tools/testing/selftests/net/netfilter/Makefile
+++ b/tools/testing/selftests/net/netfilter/Makefile
@@ -28,10 +28,9 @@ TEST_PROGS += nft_zones_many.sh
 TEST_PROGS += rpath.sh
 TEST_PROGS += xt_string.sh
 
-TEST_CUSTOM_PROGS += conntrack_dump_flush
+TEST_GEN_PROGS = conntrack_dump_flush
 
 TEST_GEN_FILES = audit_logread
-TEST_GEN_FILES += conntrack_dump_flush
 TEST_GEN_FILES += connect_close nf_queue
 TEST_GEN_FILES += sctp_collision
 
-- 
2.43.2

Re: [PATCH v2 net-next] tools: testing: selftests: prefer TEST_PROGS for conntrack_dump_flush

[patchwork-bot+netdevbpf]

Hello:

This patch was applied to netdev/net-next.git (main)
by Jakub Kicinski <kuba@kernel.org>:

On Wed, 24 Apr 2024 11:58:20 +0200 you wrote:
> Currently conntrack_dump_flush test program always runs when passing
> TEST_PROGS argument:
> 
> % make -C tools/testing/selftests TARGETS=net/netfilter \
>  TEST_PROGS=conntrack_ipip_mtu.sh run_tests
> make: Entering [..]
> TAP version 13
> 1..2 [..]
>   selftests: net/netfilter: conntrack_dump_flush [..]
> 
> [...]

Here is the summary with links:
  - [v2,net-next] tools: testing: selftests: prefer TEST_PROGS for conntrack_dump_flush
    https://git.kernel.org/netdev/net-next/c/a9e59f712582

You are awesome, thank you!
-- 
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html