summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile10
1 files changed, 5 insertions, 5 deletions
diff --git a/Makefile b/Makefile
index a263ec42..3968c113 100644
--- a/Makefile
+++ b/Makefile
@@ -36,11 +36,11 @@ create_virtualenv: ensure_virtualenv_installed
virtualenv --python=python2 $(VIRTUALENV);\
fi
-test: test_py test_js coverage
-test_py: clean requirements install coverage linters_py unit_tests_py integration_tests_py
-test_js: clean requirements_js install_js linters_js unit_tests_js
+test: clean install test_py test_js coverage
+test_py: linters_py unit_tests_py integration_tests_py
+test_js: linters_js unit_tests_js
test_all: test functional_tests
-linters: clean requirements install linters_py linters_js
+linters: linters_py linters_js
linters_py:
@. $(VIRTUALENV)/bin/activate;\
@@ -68,7 +68,7 @@ unit_tests_js:
@cd web-ui;\
npm run test
-integration_tests:
+integration_tests_py:
@. $(VIRTUALENV)/bin/activate;\
cd service;\
trial -j`grep -c "^processor" /proc/cpuinfo || sysctl -n hw.logicalcpu` --reporter=text test.integration