Message ID | 20200717215439.51672-1-briana.oursler@gmail.com |
---|---|
State | Accepted |
Delegated to: | David Miller |
Headers | show |
Series | [net-next] tc-testing: Add tdc to kselftests | expand |
From: Briana Oursler <briana.oursler@gmail.com> Date: Fri, 17 Jul 2020 14:54:39 -0700 > Add tdc to existing kselftest infrastructure so that it can be run with > existing kselftests. TDC now generates objects in objdir/kselftest > without cluttering main objdir, leaves source directory clean, and > installs correctly in kselftest_install, properly adding itself to > run_kselftest.sh script. > > Add tc-testing as a target of selftests/Makefile. Create tdc.sh to run > tdc.py targets with correct arguments. To support single target from > selftest/Makefile, combine tc-testing/bpf/Makefile and > tc-testing/Makefile. Move action.c up a directory to tc-testing/. > > Tested with: > make O=/tmp/{objdir} TARGETS="tc-testing" kselftest > cd /tmp/{objdir} > cd kselftest > cd tc-testing > ./tdc.sh > > make -C tools/testing/selftests/ TARGETS=tc-testing run_tests > > make TARGETS="tc-testing" kselftest > cd tools/testing/selftests > ./kselftest_install.sh /tmp/exampledir > My VM doesn't run all the kselftests so I commented out all except my > target and net/pmtu.sh then: > cd /tmp/exampledir && ./run_kselftest.sh > > Co-developed-by: Davide Caratti <dcaratti@redhat.com> > Signed-off-by: Davide Caratti <dcaratti@redhat.com> > Signed-off-by: Briana Oursler <briana.oursler@gmail.com> Applied, but: > @@ -0,0 +1,6 @@ > +#!/bin/sh > +# SPDX-License-Identifier: GPL-2.0 > + > +./tdc.py -c actions --nobuildebpf > +./tdc.py -c qdisc > + I had to remove this trailing newline.
diff --git a/tools/testing/selftests/Makefile b/tools/testing/selftests/Makefile index 1195bd85af38..f4522e0a2cab 100644 --- a/tools/testing/selftests/Makefile +++ b/tools/testing/selftests/Makefile @@ -54,6 +54,7 @@ TARGETS += splice TARGETS += static_keys TARGETS += sync TARGETS += sysctl +TARGETS += tc-testing TARGETS += timens ifneq (1, $(quicktest)) TARGETS += timers diff --git a/tools/testing/selftests/tc-testing/bpf/Makefile b/tools/testing/selftests/tc-testing/Makefile similarity index 79% rename from tools/testing/selftests/tc-testing/bpf/Makefile rename to tools/testing/selftests/tc-testing/Makefile index be5a5e542804..91fee5c43274 100644 --- a/tools/testing/selftests/tc-testing/bpf/Makefile +++ b/tools/testing/selftests/tc-testing/Makefile @@ -1,11 +1,11 @@ # SPDX-License-Identifier: GPL-2.0 -APIDIR := ../../../../include/uapi +top_srcdir = $(abspath ../../../..) +APIDIR := $(top_scrdir)/include/uapi TEST_GEN_FILES = action.o -top_srcdir = ../../../../.. KSFT_KHDR_INSTALL := 1 -include ../../lib.mk +include ../lib.mk CLANG ?= clang LLC ?= llc @@ -28,3 +28,6 @@ $(OUTPUT)/%.o: %.c $(CLANG) $(CLANG_FLAGS) \ -O2 -target bpf -emit-llvm -c $< -o - | \ $(LLC) -march=bpf -mcpu=$(CPU) $(LLC_FLAGS) -filetype=obj -o $@ + +TEST_PROGS += ./tdc.sh +TEST_FILES := tdc*.py Tdc*.py plugins plugin-lib tc-tests diff --git a/tools/testing/selftests/tc-testing/bpf/action.c b/tools/testing/selftests/tc-testing/action.c similarity index 100% rename from tools/testing/selftests/tc-testing/bpf/action.c rename to tools/testing/selftests/tc-testing/action.c diff --git a/tools/testing/selftests/tc-testing/tdc.sh b/tools/testing/selftests/tc-testing/tdc.sh new file mode 100755 index 000000000000..e5d2c0e97bda --- /dev/null +++ b/tools/testing/selftests/tc-testing/tdc.sh @@ -0,0 +1,6 @@ +#!/bin/sh +# SPDX-License-Identifier: GPL-2.0 + +./tdc.py -c actions --nobuildebpf +./tdc.py -c qdisc + diff --git a/tools/testing/selftests/tc-testing/tdc_config.py b/tools/testing/selftests/tc-testing/tdc_config.py index 080709cc4297..cd4a27ee1466 100644 --- a/tools/testing/selftests/tc-testing/tdc_config.py +++ b/tools/testing/selftests/tc-testing/tdc_config.py @@ -24,7 +24,7 @@ NAMES = { # Name of the namespace to use 'NS': 'tcut', # Directory containing eBPF test programs - 'EBPFDIR': './bpf' + 'EBPFDIR': './' }