Remove 'test-js-precommit' target from Makefile

When performing `make precommit`, instead of running only a subset of
the Jerry Test Suite on full profile builds, run the whole suite, and
also run the compact subset of the suite on compact builds. Also, make
CI perform the same tests.

Related issue: #879
Related PR: #912

JerryScript-DCO-1.0-Signed-off-by: László Langó llango.u-szeged@partner.samsung.com
This commit is contained in:
László Langó
2016-05-17 14:14:26 +02:00
parent 00f759e275
commit 1938415b0d
3 changed files with 5 additions and 1479 deletions
+3 -3
View File
@@ -15,15 +15,15 @@ script: "make -j VERBOSE=1 NINJA=1 $TARGET"
env:
- TARGET="check-signed-off check-vera check-cppcheck"
- TARGET="build.linux test-js-precommit"
- TARGET="build.linux test-js-precommit" TOOLCHAIN=build/configs/toolchain_linux_armv7l-hf.cmake TIMEOUT=300
- TARGET="build.linux test-js"
- TARGET="build.linux test-js" TOOLCHAIN=build/configs/toolchain_linux_armv7l-hf.cmake TIMEOUT=300
- TARGET=test-buildoptions
- TARGET=test-unit
matrix:
include:
- os: osx
env: TARGET="build.darwin test-js-precommit"
env: TARGET="build.darwin test-js"
- os: osx
env: TARGET=test-unit
allow_failures:
+2 -9
View File
@@ -149,7 +149,6 @@ JERRY_BUILD_OPTIONS_TEST_TARGETS_NATIVE += unittests
# JS test suites (in the format of id:path)
export JERRY_TEST_SUITE_J := j:$(ROOT_DIR)/tests/jerry
export JERRY_TEST_SUITE_JTS := jts:$(ROOT_DIR)/tests/jerry-test-suite
export JERRY_TEST_SUITE_JTS_PREC := jts-prec:$(ROOT_DIR)/tests/jerry-test-suite/precommit-test-list
export JERRY_TEST_SUITE_JTS_CP := jts-cp:$(ROOT_DIR)/tests/jerry-test-suite/compact-profile-list
# Default make target
@@ -308,7 +307,7 @@ test-js.$(1).$(2): build.$$(NATIVE_SYSTEM)
endef
$(foreach __TARGET,$(JERRY_TEST_TARGETS), \
$(foreach __SUITE,$(JERRY_TEST_SUITE_J) $(JERRY_TEST_SUITE_JTS_PREC) $(JERRY_TEST_SUITE_JTS), \
$(foreach __SUITE,$(JERRY_TEST_SUITE_J) $(JERRY_TEST_SUITE_JTS), \
$(eval $(call JSTEST_RULE,$(__TARGET),$(firstword $(subst :, ,$(__SUITE))),$(lastword $(subst :, ,$(__SUITE)))))))
$(foreach __TARGET,$(JERRY_TEST_TARGETS_CP), \
@@ -364,12 +363,6 @@ test-js: \
$(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: test-buildoptions
test-buildoptions: \
$(foreach __TARGET,$(JERRY_BUILD_OPTIONS_TEST_TARGETS_NATIVE), \
@@ -386,7 +379,7 @@ precommit: prerequisites
$(Q) echo "...building and running unit tests..."
$(Q)+$(MAKE) --no-print-directory test-unit
$(Q) echo "...running precommit JS tests..."
$(Q)+$(MAKE) --no-print-directory test-js-precommit
$(Q)+$(MAKE) --no-print-directory test-js
$(Q) echo "...SUCCESS"
# Targets to install and clean prerequisites
File diff suppressed because it is too large Load Diff