diff options
| -rw-r--r-- | Makefile | 4 | ||||
| -rw-r--r-- | mk/util.mk | 5 | ||||
| -rw-r--r-- | src/js/tests/build.mk | 4 |
3 files changed, 11 insertions, 2 deletions
@@ -84,7 +84,9 @@ $(eval $(call subdir,doc)) # Don't try to run any of this if maven isn't installed MVN_EXE := $(shell which mvn 2>/dev/null) -ifneq "$(MVN_EXE)" "" +ifeq "$(MVN_EXE)" "" +$(call strict-error,"No maven found unable to run java tests") +else # package/install various maven sub-projects MVN_TEST_CMD := xvfb-run -a $(MVN_EXE) test @@ -28,5 +28,10 @@ quiet_cmd_cp = CP $(call drop-prefix,$@) cmd_cp = cp $< $@ +ifeq "$(strict)" "1" +strict-error = $(error $1) +endif + + print-%: @echo "$* = $($*)" diff --git a/src/js/tests/build.mk b/src/js/tests/build.mk index b49109d..041e207 100644 --- a/src/js/tests/build.mk +++ b/src/js/tests/build.mk @@ -7,7 +7,9 @@ clean:: # Jasmine Specs ############################################################### -ifneq "$(PHANTOM_EXE)" "" +ifeq "$(PHANTOM_EXE)" "" +$(call strict-error,"phantomjs not found, unable to run javascript tests") +else test: test-js test-js: |