aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile19
1 files changed, 5 insertions, 14 deletions
diff --git a/Makefile b/Makefile
index d98b544..f00f25c 100644
--- a/Makefile
+++ b/Makefile
@@ -59,7 +59,11 @@ clean::
# Subdirs ######################################################################
-$(eval $(call subdir,contexts))
+$(eval $(call subdir,src/js/fiveui))
+$(eval $(call subdir,src/js/chrome))
+$(eval $(call subdir,src/js/firefox))
+$(eval $(call subdir,src/js/tests))
+
$(eval $(call subdir,profiles))
$(eval $(call subdir,doc))
@@ -92,16 +96,3 @@ test: fiveui.crx fiveui.xpi $(topdir)/profiles/chrome $(topdir)/profiles/firefox
cd $(HEADLESS_DIR) && $(MVN_TEST_CMD)
endif
-
-
-# JS Unit Tests ###############################################################
-
-ifneq "$(PHANTOM_EXE)" ""
-
-test: test-js
-test-js:
- cd $(topdir)/contexts/data && $(PHANTOM_EXE) \
- lib/phantomjs_jasmine/phantomjs_jasminexml_runner.js \
- tests/PhantomJSJasmineRunner.html tests/reports/
-
-endif