X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=test%2FMakefile;h=2d58b7f186e27cc7267c0650628bdfa0f5af5c3f;hb=46d2dc8b348888958550feab90da03afaf331d11;hp=95a3c7b79e2def8503434c05e25e1c10e6acc44e;hpb=d27e7c35612f632ab868138d4d97641ba9da2510;p=mkws-moved-to-github.git diff --git a/test/Makefile b/test/Makefile index 95a3c7b..2d58b7f 100644 --- a/test/Makefile +++ b/test/Makefile @@ -3,8 +3,11 @@ # For running on Mike's local install of node.js MIKE = PATH=$$PATH:/usr/local/lib/node-v0.10.24-linux-x64/bin +APACHE_PORT:= $(shell echo $${APACHE_PORT-4040}) + #PHANTOMJS_URL=https://mkws-dev.indexdata.com/jasmine-popup.html -PHANTOMJS_URL=http://localhost:4040/jasmine-local-popup.html +PHANTOMJS_PATH=jasmine-local-popup.html +PHANTOMJS_URL=http://localhost:${APACHE_PORT}/${PHANTOMJS_PATH} PHANTOMJS_TIMEOUT=16 NPM_INSTALL_FLAGS=-q @@ -35,7 +38,7 @@ clean-tmp: touch ${TMP_DIR}/.gitkeep mkws-complete-syntax-check: - ${MAKE} -C../src mkws-complete.min.js + ${MAKE} -C../tools/htdocs mkws-complete.min.js check: mkws-complete-syntax-check @if [ ! -e node_modules ]; then echo "please run first: make node-modules"; exit 1; fi