diff options
| author |   David S. Miller <davem@davemloft.net> | 2019-08-27 14:23:31 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-08-27 14:23:31 -0700 |
| commit | 68aaf4459556b1f9370c259fd486aecad2257552 (patch) | |
| tree | 99d92536a3263634969be6b70a96facea85a0df1 /tools/testing/selftests/bpf/Makefile | |
| parent | nfp: add AMDA0058 boards to firmware list (diff) | |
| parent | Merge tag 'nfs-for-5.3-3' of git://git.linux-nfs.org/projects/trondmy/linux-nfs (diff) | |
| download | linux-dev-68aaf4459556b1f9370c259fd486aecad2257552.tar.xz linux-dev-68aaf4459556b1f9370c259fd486aecad2257552.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Minor conflict in r8169, bug fix had two versions in net
and net-next, take the net-next hunks.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'tools/testing/selftests/bpf/Makefile')
| -rw-r--r-- | tools/testing/selftests/bpf/Makefile | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/tools/testing/selftests/bpf/Makefile b/tools/testing/selftests/bpf/Makefile index 29001f944db7..d69c541e2039 100644 --- a/tools/testing/selftests/bpf/Makefile +++ b/tools/testing/selftests/bpf/Makefile @@ -34,6 +34,9 @@ TEST_GEN_PROGS = test_verifier test_tag test_maps test_lru_map test_lpm_map test BPF_OBJ_FILES = $(patsubst %.c,%.o, $(notdir $(wildcard progs/*.c))) TEST_GEN_FILES = $(BPF_OBJ_FILES) +BTF_C_FILES = $(wildcard progs/btf_dump_test_case_*.c) +TEST_FILES = $(BTF_C_FILES) + # Also test sub-register code-gen if LLVM has eBPF v3 processor support which # contains both ALU32 and JMP32 instructions. SUBREG_CODEGEN := $(shell echo "int cal(int a) { return a > 0; }" | \ @@ -68,7 +71,8 @@ TEST_PROGS := test_kmod.sh \ TEST_PROGS_EXTENDED := with_addr.sh \ with_tunnels.sh \ tcp_client.py \ - tcp_server.py + tcp_server.py \ + test_xdp_vlan.sh # Compile but not part of 'make run_tests' TEST_GEN_PROGS_EXTENDED = test_libbpf_open test_sock_addr test_skb_cgroup_id_user \ |