X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=test%2FMakefile;h=7ac50624b606cb443326c90af301fc5ca64ca481;hb=00caadcaa6b202a7087d25d4c9396a4aa5288098;hp=57b5c4692dcdea18f995528f51f95c58c19048da;hpb=a6302cae8f48c3448a63b6cbd0d1ccab12232e2d;p=mkws-moved-to-github.git

diff --git a/test/Makefile b/test/Makefile
index 57b5c46..7ac5062 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -3,9 +3,12 @@
 # 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_TIMEOUT=16
+PHANTOMJS_PATH=jasmine-local-popup.html
+PHANTOMJS_URL=http://localhost:${APACHE_PORT}/${PHANTOMJS_PATH}
+PHANTOMJS_TIMEOUT=18
 
 NPM_INSTALL_FLAGS=-q
 JASMINE_NODE=	./node_modules/jasmine-node/bin/jasmine-node
@@ -25,6 +28,7 @@ clean:
 distclean: clean clean-tmp clean-error
 	rm -rf node_modules
 	rm -f ${TMP_DIR}/jasmine-dev
+	rm -f libexec
 
 clean-error:
 	rm -f mkws-error.png.* mkws-error.html.*
@@ -103,5 +107,10 @@ help:
 	@echo "     [ node-modules ]"
 	@echo "     [ apache-stop apache-start ]"
 	@echo ""
-	@echo "DEBUG=1 make phantomjs PHANTOMJS_TIMEOUT=12 PHANTOMJS_URL=${PHANTOMJS_URL}"
+	@echo "Examples"
+	@echo ""
+	@echo "make phantomjs PHANTOMJS_PATH=${PHANTOMJS_PATH}"
+	@echo "DEBUG=0 APACHE_PORT=5050 make -s phantomjs PHANTOMJS_TIMEOUT=12 PHANTOMJS_PATH=${PHANTOMJS_PATH}"
+	@echo "DEBUG=2 make phantomjs PHANTOMJS_TIMEOUT=12 PHANTOMJS_URL=${PHANTOMJS_URL}"
+	@echo ""