Merging the functionality of tools/runners/run-test-suite-jerry*.sh into the Makefile

JerryScript-DCO-1.0-Signed-off-by: Akos Kiss [email protected]

Author: akosthekiss

Makefile

@@ -128,9 +128,14 @@ export JERRY_TEST_TARGETS := \
   $(foreach __MODE,$(DEBUG_MODES) $(RELEASE_MODES), \
     $(__MODE).$(NATIVE_SYSTEM))
 
-export JERRY_TEST_SUITES := \
-  0:./tests/jerry \
-  1:./tests/jerry-test-suite/precommit_test_list
+export JERRY_TEST_TARGETS_CP := \
+  $(foreach __MODE,$(DEBUG_MODES) $(RELEASE_MODES), \
+    $(__MODE).$(NATIVE_SYSTEM)-cp)
+
+export JERRY_TEST_SUITE_J := 0:./tests/jerry
+export JERRY_TEST_SUITE_JTS_PREC := 1:./tests/jerry-test-suite/precommit_test_list
+export JERRY_TEST_SUITE_JTS := 2:./tests/jerry-test-suite
+export JERRY_TEST_SUITE_JTS_CP := 3:./tests/jerry-test-suite/compact_profile_list
 
 # Directories
 export BUILD_DIR_PREFIX := ./build/obj
@@ -310,7 +315,7 @@ $(eval $(call BUILD_RULE,unittests,$(NATIVE_SYSTEM),unittests,Build))
 # would work in the same directory in parallel, and they would overwrite each
 # others output. This manifests mostly in the repeated builds of jerry-libc and
 # its non-deterministically vanishing .a files.
-define JSTEST_SUITE_RULE
+define JSTEST_RULE
 test-js.$(1).$(2): build-all.$$(NATIVE_SYSTEM)
 	$$(Q) $$(call SHLOG,./tools/runners/run-test-suite.sh \
           $$(OUT_DIR)/$(1)/jerry \
@@ -319,18 +324,12 @@ test-js.$(1).$(2): build-all.$$(NATIVE_SYSTEM)
 endef
 
 $(foreach __TARGET,$(JERRY_TEST_TARGETS), \
-  $(foreach __SUITE,$(JERRY_TEST_SUITES), \
-    $(eval $(call JSTEST_SUITE_RULE,$(__TARGET),$(firstword $(subst :, ,$(__SUITE))),$(lastword $(subst :, ,$(__SUITE)))))))
-
-# Make rule macro to test a build target with all test suites
-#
-# $(1) - name of the target to test
-define JSTEST_TARGET_RULE
-test-js.$(1): $$(foreach __SUITE,$$(JERRY_TEST_SUITES),test-js.$(1).$$(firstword $$(subst :, ,$$(__SUITE))))
-endef
+  $(foreach __SUITE,$(JERRY_TEST_SUITE_J) $(JERRY_TEST_SUITE_JTS_PREC) $(JERRY_TEST_SUITE_JTS), \
+    $(eval $(call JSTEST_RULE,$(__TARGET),$(firstword $(subst :, ,$(__SUITE))),$(lastword $(subst :, ,$(__SUITE)))))))
 
-$(foreach __TARGET,$(JERRY_TEST_TARGETS), \
-  $(eval $(call JSTEST_TARGET_RULE,$(__TARGET))))
+$(foreach __TARGET,$(JERRY_TEST_TARGETS_CP), \
+  $(foreach __SUITE,$(JERRY_TEST_SUITE_JTS_CP), \
+    $(eval $(call JSTEST_RULE,$(__TARGET),$(firstword $(subst :, ,$(__SUITE))),$(lastword $(subst :, ,$(__SUITE)))))))
 
 # Targets to perform batch builds, checks, and tests
 
@@ -354,12 +353,22 @@ build: $(patsubst %,build-all.%,$(NATIVE_SYSTEM) $(foreach __SYSTEM,$(MCU_SYSTEM
 
 .PHONY: test-unit
 test-unit: unittests
-	$(Q) rm -rf $(OUT_DIR)/unittests/check
-	$(Q) mkdir -p $(OUT_DIR)/unittests/check
 	$(Q) $(call SHLOG,./tools/runners/run-unittests.sh $(OUT_DIR)/unittests,$(OUT_DIR)/unittests/check/unittests.log,Unit tests)
 
 .PHONY: test-js
-test-js: $(foreach __TARGET,$(JERRY_TEST_TARGETS),test-js.$(__TARGET))
+test-js: \
+        $(foreach __TARGET,$(JERRY_TEST_TARGETS), \
+          $(foreach __SUITE,$(JERRY_TEST_SUITE_J) $(JERRY_TEST_SUITE_JTS), \
+            test-js.$(__TARGET).$(firstword $(subst :, ,$(__SUITE))))) \
+        $(foreach __TARGET,$(JERRY_TEST_TARGETS_CP), \
+          $(foreach __SUITE,$(JERRY_TEST_SUITE_JTS_CP), \
+            test-js.$(__TARGET).$(firstword $(subst :, ,$(__SUITE)))))
+
+.PHONY: test-js-precommit
+test-js-precommit: \
+        $(foreach __TARGET,$(JERRY_TEST_TARGETS), \
+          $(foreach __SUITE,$(JERRY_TEST_SUITE_J) $(JERRY_TEST_SUITE_JTS_PREC), \
+            test-js.$(__TARGET).$(firstword $(subst :, ,$(__SUITE)))))
 
 .PHONY: precommit
 precommit: 
@@ -368,8 +377,8 @@ precommit:
 	$(Q)+$(MAKE) --no-print-directory check-signed-off check-vera check-cpp build unittests
 	$(Q) echo "...running unit tests..."
 	$(Q)+$(MAKE) --no-print-directory test-unit
-	$(Q) echo "...running JS tests..."
-	$(Q)+$(MAKE) --no-print-directory test-js
+	$(Q) echo "...running precommit JS tests..."
+	$(Q)+$(MAKE) --no-print-directory test-js-precommit
 	$(Q) echo "...SUCCESS"
 
 # Targets to install and clean prerequisites