diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-01-28 08:22:00 +0100 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-01-28 08:22:00 +0100 |
commit | 83b21ed0fc2a7b17c6b9d4f72f664841f797380b (patch) | |
tree | 99272c0f69b8d762bf82400e6bdb84146b5baadb /tools/testing/selftests/bpf/Makefile | |
parent | sysrq: Remove duplicated sysrq message (diff) | |
parent | Linux 5.0-rc4 (diff) | |
download | linux-83b21ed0fc2a7b17c6b9d4f72f664841f797380b.tar.xz linux-83b21ed0fc2a7b17c6b9d4f72f664841f797380b.zip |
Merge 5.0-rc4 into tty-next
We need the tty and serial fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'tools/testing/selftests/bpf/Makefile')
-rw-r--r-- | tools/testing/selftests/bpf/Makefile | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/tools/testing/selftests/bpf/Makefile b/tools/testing/selftests/bpf/Makefile index 73aa6d8f4a2f..41ab7a3668b3 100644 --- a/tools/testing/selftests/bpf/Makefile +++ b/tools/testing/selftests/bpf/Makefile @@ -55,7 +55,10 @@ TEST_PROGS := test_kmod.sh \ test_flow_dissector.sh \ test_xdp_vlan.sh -TEST_PROGS_EXTENDED := with_addr.sh +TEST_PROGS_EXTENDED := with_addr.sh \ + with_tunnels.sh \ + tcp_client.py \ + tcp_server.py # Compile but not part of 'make run_tests' TEST_GEN_PROGS_EXTENDED = test_libbpf_open test_sock_addr test_skb_cgroup_id_user \ |