summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile7
1 files changed, 4 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index eb5a5df76..5f1721a0c 100644
--- a/Makefile
+++ b/Makefile
@@ -159,10 +159,11 @@ appstore:
# from the internet
.PHONY: test
test:
-ifeq (,$(wildcard $(CURDIR)/package.json))
+ifneq (,$(wildcard $(CURDIR)/js/package.json))
cd js && $(npm) run test
-else
- npm run test
+endif
+ifneq (,$(wildcard $(CURDIR)/package.json))
+ $(npm) run test
endif
ifeq (, $(shell which phpunit 2> /dev/null))
@echo "No phpunit command available, downloading a copy from the web"