diff options
| author | Ingo Molnar <mingo@kernel.org> | 2017-10-14 10:11:45 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-10-14 10:11:45 +0200 |
| commit | 6edcf57233108df2e50ab5d3fa695ea958b4c779 (patch) | |
| tree | 7f233132de3cf1d438ac5ca51cfa6e9c48f8b86f /tools/testing/selftests/net/Makefile | |
| parent | x86/unwinder: Make CONFIG_UNWINDER_ORC=y the default in the 64-bit defconfig (diff) | |
| parent | objtool: Upgrade libelf-devel warning to error for CONFIG_ORC_UNWINDER (diff) | |
| download | linux-6edcf57233108df2e50ab5d3fa695ea958b4c779.tar.xz linux-6edcf57233108df2e50ab5d3fa695ea958b4c779.zip | |
Merge branch 'core/urgent' into x86/asm, to pick up dependency
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools/testing/selftests/net/Makefile')
| -rw-r--r-- | tools/testing/selftests/net/Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/testing/selftests/net/Makefile b/tools/testing/selftests/net/Makefile index de1f5772b878..d86bca991f45 100644 --- a/tools/testing/selftests/net/Makefile +++ b/tools/testing/selftests/net/Makefile @@ -5,9 +5,9 @@ CFLAGS += -I../../../../usr/include/ TEST_PROGS := run_netsocktests run_afpackettests test_bpf.sh netdevice.sh rtnetlink.sh TEST_GEN_FILES = socket -TEST_GEN_FILES += psock_fanout psock_tpacket -TEST_GEN_FILES += reuseport_bpf reuseport_bpf_cpu reuseport_bpf_numa -TEST_GEN_FILES += reuseport_dualstack msg_zerocopy +TEST_GEN_FILES += psock_fanout psock_tpacket msg_zerocopy +TEST_GEN_PROGS = reuseport_bpf reuseport_bpf_cpu reuseport_bpf_numa +TEST_GEN_PROGS += reuseport_dualstack reuseaddr_conflict include ../lib.mk |