Skip to content

Commit c614175

Browse files
committed
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ó [email protected]
1 parent 2d7f1d1 commit c614175

File tree

3 files changed

+5
-1479
lines changed

3 files changed

+5
-1479
lines changed

.travis.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,15 @@ script: "make -j VERBOSE=1 NINJA=1 $TARGET"
1515

1616
env:
1717
- TARGET="check-signed-off check-vera check-cppcheck"
18-
- TARGET="build.linux test-js-precommit"
19-
- TARGET="build.linux test-js-precommit" TOOLCHAIN=build/configs/toolchain_linux_armv7l-hf.cmake TIMEOUT=300
18+
- TARGET="build.linux test-js"
19+
- TARGET="build.linux test-js" TOOLCHAIN=build/configs/toolchain_linux_armv7l-hf.cmake TIMEOUT=300
2020
- TARGET=test-buildoptions
2121
- TARGET=test-unit
2222

2323
matrix:
2424
include:
2525
- os: osx
26-
env: TARGET="build.darwin test-js-precommit"
26+
env: TARGET="build.darwin test-js"
2727
- os: osx
2828
env: TARGET=test-unit
2929
allow_failures:

Makefile

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,6 @@ JERRY_BUILD_OPTIONS_TEST_TARGETS_NATIVE += unittests
149149
# JS test suites (in the format of id:path)
150150
export JERRY_TEST_SUITE_J := j:$(ROOT_DIR)/tests/jerry
151151
export JERRY_TEST_SUITE_JTS := jts:$(ROOT_DIR)/tests/jerry-test-suite
152-
export JERRY_TEST_SUITE_JTS_PREC := jts-prec:$(ROOT_DIR)/tests/jerry-test-suite/precommit-test-list
153152
export JERRY_TEST_SUITE_JTS_CP := jts-cp:$(ROOT_DIR)/tests/jerry-test-suite/compact-profile-list
154153

155154
# Default make target
@@ -308,7 +307,7 @@ test-js.$(1).$(2): build.$$(NATIVE_SYSTEM)
308307
endef
309308

310309
$(foreach __TARGET,$(JERRY_TEST_TARGETS), \
311-
$(foreach __SUITE,$(JERRY_TEST_SUITE_J) $(JERRY_TEST_SUITE_JTS_PREC) $(JERRY_TEST_SUITE_JTS), \
310+
$(foreach __SUITE,$(JERRY_TEST_SUITE_J) $(JERRY_TEST_SUITE_JTS), \
312311
$(eval $(call JSTEST_RULE,$(__TARGET),$(firstword $(subst :, ,$(__SUITE))),$(lastword $(subst :, ,$(__SUITE)))))))
313312

314313
$(foreach __TARGET,$(JERRY_TEST_TARGETS_CP), \
@@ -364,12 +363,6 @@ test-js: \
364363
$(foreach __SUITE,$(JERRY_TEST_SUITE_JTS_CP), \
365364
test-js.$(__TARGET).$(firstword $(subst :, ,$(__SUITE)))))
366365

367-
.PHONY: test-js-precommit
368-
test-js-precommit: \
369-
$(foreach __TARGET,$(JERRY_TEST_TARGETS), \
370-
$(foreach __SUITE,$(JERRY_TEST_SUITE_J) $(JERRY_TEST_SUITE_JTS_PREC), \
371-
test-js.$(__TARGET).$(firstword $(subst :, ,$(__SUITE)))))
372-
373366
.PHONY: test-buildoptions
374367
test-buildoptions: \
375368
$(foreach __TARGET,$(JERRY_BUILD_OPTIONS_TEST_TARGETS_NATIVE), \
@@ -386,7 +379,7 @@ precommit: prerequisites
386379
$(Q) echo "...building and running unit tests..."
387380
$(Q)+$(MAKE) --no-print-directory test-unit
388381
$(Q) echo "...running precommit JS tests..."
389-
$(Q)+$(MAKE) --no-print-directory test-js-precommit
382+
$(Q)+$(MAKE) --no-print-directory test-js
390383
$(Q) echo "...SUCCESS"
391384

392385
# Targets to install and clean prerequisites

0 commit comments

Comments
 (0)