summaryrefslogtreecommitdiff
path: root/mk
diff options
context:
space:
mode:
authorBruce Richardson <bruce.richardson@intel.com>2019-02-26 12:19:03 +0000
committerThomas Monjalon <thomas@monjalon.net>2019-02-26 15:29:27 +0100
commita9de470cc7c0649221e156fc5f30a2dbdfe7c166 (patch)
tree8542c415a1e3201759dd580a800f23fa80f27f25 /mk
parent25d11a86c56d50947af33d0b79ede622809bd8b9 (diff)
downloaddpdk-a9de470cc7c0649221e156fc5f30a2dbdfe7c166.zip
dpdk-a9de470cc7c0649221e156fc5f30a2dbdfe7c166.tar.gz
dpdk-a9de470cc7c0649221e156fc5f30a2dbdfe7c166.tar.xz
test: move to app directory
Since all other apps have been moved to the "app" folder, the autotest app remains alone in the test folder. Rather than having an entire top-level folder for this, we can move it back to where it all started in early versions of DPDK - the "app/" folder. This move has a couple of advantages: * This reduces clutter at the top level of the project, due to one less folder. * It eliminates the separate build task necessary for building the autotests using make "make test-build" which means that developers are less likely to miss something in their own compilation tests * It re-aligns the final location of the test binary in the app folder when building with make with it's location in the source tree. For meson builds, the autotest app is different from the other apps in that it needs a series of different test cases defined for it for use by "meson test". Therefore, it does not get built as part of the main loop in the app folder, but gets built separately at the end. Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
Diffstat (limited to 'mk')
-rw-r--r--mk/rte.sdkbuild.mk3
-rw-r--r--mk/rte.sdkroot.mk6
-rw-r--r--mk/rte.sdktest.mk8
3 files changed, 6 insertions, 11 deletions
diff --git a/mk/rte.sdkbuild.mk b/mk/rte.sdkbuild.mk
index 5dc43e4..b512de1 100644
--- a/mk/rte.sdkbuild.mk
+++ b/mk/rte.sdkbuild.mk
@@ -40,9 +40,6 @@ clean: $(CLEANDIRS)
$(Q)$(MAKE) -f $(RTE_SDK)/GNUmakefile gcovclean
@echo Clean complete
-.PHONY: test-build
-test-build: test
-
.SECONDEXPANSION:
.PHONY: $(ROOTDIRS-y) $(ROOTDIRS-)
$(ROOTDIRS-y) $(ROOTDIRS-):
diff --git a/mk/rte.sdkroot.mk b/mk/rte.sdkroot.mk
index 18c8801..d91583a 100644
--- a/mk/rte.sdkroot.mk
+++ b/mk/rte.sdkroot.mk
@@ -57,8 +57,8 @@ export BUILDDIR
export ROOTDIRS-y ROOTDIRS- ROOTDIRS-n
-.PHONY: default
-default: all
+.PHONY: default test-build
+default test-build: all
.PHONY: config defconfig showconfigs showversion showversionum
config defconfig showconfigs showversion showversionum:
@@ -72,8 +72,6 @@ cscope gtags tags etags:
test test-fast test-perf coverage test-drivers test-dump:
$(Q)$(MAKE) -f $(RTE_SDK)/mk/rte.sdktest.mk $@
-test: test-build
-
.PHONY: install
install:
$(Q)$(MAKE) -f $(RTE_SDK)/mk/rte.sdkinstall.mk pre_install
diff --git a/mk/rte.sdktest.mk b/mk/rte.sdktest.mk
index 2955928..803018b 100644
--- a/mk/rte.sdktest.mk
+++ b/mk/rte.sdktest.mk
@@ -49,12 +49,12 @@ test test-fast test-perf test-drivers test-dump:
@mkdir -p $(AUTOTEST_DIR) ; \
cd $(AUTOTEST_DIR) ; \
if [ -f $(RTE_OUTPUT)/app/test ]; then \
- python $(RTE_SDK)/test/test/autotest.py \
+ python $(RTE_SDK)/app/test/autotest.py \
$(RTE_OUTPUT)/app/test \
$(RTE_TARGET) \
$(BLACKLIST) $(WHITELIST); \
else \
- echo "No test found, please do a 'make test-build' first, or specify O=" ; \
+ echo "No test found, please do a 'make' first, or specify O=" ; \
fi
# this is a special target to ease the pain of running coverage tests
@@ -66,11 +66,11 @@ coverage:
python $(RTE_SDK)/test/cmdline_test/cmdline_test.py \
$(RTE_OUTPUT)/app/cmdline_test; \
ulimit -S -n 100 ; \
- python $(RTE_SDK)/test/test/autotest.py \
+ python $(RTE_SDK)/app/test/autotest.py \
$(RTE_OUTPUT)/app/test \
$(RTE_TARGET) \
$(BLACKLIST) $(WHITELIST) ; \
$(RTE_OUTPUT)/app/dpdk-procinfo --file-prefix=ring_perf -- -m; \
else \
- echo "No test found, please do a 'make test-build' first, or specify O=" ;\
+ echo "No test found, please do a 'make' first, or specify O=" ;\
fi