make test: Copy api_post_mortem.$$ file tmp test dir for archiving.

[vpp.git] / test / Makefile

diff --git a/test/Makefile b/test/Makefile
index 72b4dac..da77acc 100644 (file)
--- a/test/Makefile
+++ b/test/Makefile
@@ -86,8 +86,7 @@ $(PAPI_INSTALL_DONE): $(PIP_PATCH_DONE)
        @touch $@
 
 define retest-func
-       @env VPP_TEST_FAILED_DIR=$(VPP_TEST_FAILED_DIR) scripts/setsid_wrapper.sh $(FORCE_FOREGROUND) $(PYTHON_VENV_PATH)/bin/activate python run_tests.py -d $(TEST_DIR) $(UNITTEST_EXTRA_OPTS)
-       @env VPP_TEST_FAILED_DIR=$(VPP_TEST_FAILED_DIR) scripts/compress_failed.sh
+       @env VPP_TEST_FAILED_DIR=$(VPP_TEST_FAILED_DIR) scripts/setsid_wrapper.sh $(FORCE_FOREGROUND) $(PYTHON_VENV_PATH)/bin/activate python run_tests.py -d $(TEST_DIR) $(UNITTEST_EXTRA_OPTS) || env VPP_TEST_FAILED_DIR=$(VPP_TEST_FAILED_DIR) COMPRESS_FAILED_TEST_LOGS=$(COMPRESS_FAILED_TEST_LOGS) scripts/compress_failed.sh
 endef
 
 .PHONY: sanity
@@ -107,7 +106,11 @@ sanity: verify-no-running-vpp
                 echo \"*******************************************************************\" &&\
                 false)"
 
-test: verify-python-path $(PAPI_INSTALL_DONE) sanity reset 
+.PHONY: ext
+ext:
+       make -C ext
+
+test: verify-python-path $(PAPI_INSTALL_DONE) ext sanity reset
        $(call retest-func)
 
 retest: verify-python-path sanity reset
@@ -136,6 +139,7 @@ reset:
        @mkdir $(VPP_TEST_FAILED_DIR)
 
 wipe: reset
+       @make -C ext clean
        @rm -rf $(PYTHON_VENV_PATH)
        @rm -f $(PAPI_INSTALL_FLAGS)