|
|
@@ -86,6 +86,10 @@ INTEGRATIONTEST_TARGET := $(OBJ_DIR)test/integrationtest/integrationtest
|
|
|
INTEGRATIONTEST_TARGET_AUTH := $(OBJ_DIR)test/integrationtest_auth/integrationtest_auth
|
|
|
|
|
|
TEST_RUN_TARGETS := unittest integrationtest integrationtest_auth
|
|
|
+# ensure the tests are running one after another when general test target is called
|
|
|
+ifneq ($(filter test,$(MAKECMDGOALS)),)
|
|
|
+TEST_RUN_TARGETS_HELPER := $(TEST_RUN_TARGETS)
|
|
|
+endif
|
|
|
TEST_TARGETS := $(UNITTEST_TARGET) $(INTEGRATIONTEST_TARGET) $(INTEGRATIONTEST_TARGET_AUTH)
|
|
|
|
|
|
OBJ := $(COBJ) $(EXAMPLE_COBJ) $(UNITTEST_CPPOBJ) $(INTEGRATIONTEST_CPPOBJ) $(INTEGRATIONTEST_COBJ) $(INTEGRATIONTEST_AUTH_CPPOBJ) $(INTEGRATIONTEST_AUTH_COBJ)
|
|
|
@@ -112,7 +116,7 @@ cppcheck:
|
|
|
cppcheck-htmlreport --file=output/cppcheck/cppcheck.xml --title="Shellmatta" --report-dir=output/cppcheck/html
|
|
|
|
|
|
|
|
|
-$(TEST_RUN_TARGETS): $(TEST_TARGETS) $(filter-out $@,$(TEST_RUN_TARGETS))
|
|
|
+$(TEST_RUN_TARGETS): $(TEST_TARGETS) $(filter-out $@,$(TEST_RUN_TARGETS_HELPER))
|
|
|
- @mkdir -p output/test/$@/report
|
|
|
@echo running test $@:
|
|
|
# remove coverage from former run
|
stefan