X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=test%2FMakefile;h=2d58b7f186e27cc7267c0650628bdfa0f5af5c3f;hb=cd1388ebf3b69038d495f12e120bdfc02a2e7aa2;hp=57b5c4692dcdea18f995528f51f95c58c19048da;hpb=a6302cae8f48c3448a63b6cbd0d1ccab12232e2d;p=mkws-moved-to-github.git diff --git a/test/Makefile b/test/Makefile index 57b5c46..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