X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=test%2FMakefile;h=65fbc3e5ead40ce6d09783cb54ca8429fb8a840b;hb=09bc6df503cbcb0a222a2888294a2294d897d1bb;hp=2d58b7f186e27cc7267c0650628bdfa0f5af5c3f;hpb=a4648414114773d8cdb403ebb5f88afbc93664b9;p=mkws-moved-to-github.git

diff --git a/test/Makefile b/test/Makefile
index 2d58b7f..65fbc3e 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -1,4 +1,4 @@
-# Copyright (c) 2013-2014 IndexData ApS. http://indexdata.com
+# Copyright (c) 2013-2014 Index Data ApS. http://indexdata.com
 
 # For running on Mike's local install of node.js
 MIKE = PATH=$$PATH:/usr/local/lib/node-v0.10.24-linux-x64/bin
@@ -8,7 +8,7 @@ APACHE_PORT:= $(shell echo $${APACHE_PORT-4040})
 #PHANTOMJS_URL=https://mkws-dev.indexdata.com/jasmine-popup.html	
 PHANTOMJS_PATH=jasmine-local-popup.html
 PHANTOMJS_URL=http://localhost:${APACHE_PORT}/${PHANTOMJS_PATH}
-PHANTOMJS_TIMEOUT=16
+PHANTOMJS_TIMEOUT=18
 
 NPM_INSTALL_FLAGS=-q
 JASMINE_NODE=	./node_modules/jasmine-node/bin/jasmine-node
@@ -28,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.*
@@ -55,6 +56,12 @@ phantomjs p: apache-stop apache-start _phantomjs
 _phantomjs:
 	perl ./bin/bomb.pl --timeout="${PHANTOMJS_TIMEOUT}.5" ${PHANTOMJS} phantom/run-jasmine.js ${PHANTOMJS_URL} ${PHANTOMJS_TIMEOUT}
 
+phantomjs-all p-all:
+	${MAKE} phantomjs PHANTOMJS_PATH=jasmine-local-popup.html
+	${MAKE} phantomjs PHANTOMJS_PATH=jasmine-popup.html
+	${MAKE} phantomjs PHANTOMJS_PATH=jasmine-cors-popup.html
+	${MAKE} phantomjs PHANTOMJS_PATH=jasmine.html
+
 mike-test:
 	$(MAKE) _phantomjs PHANTOMJS_URL=http://x.example.indexdata.com/jasmine-popup.html
 
@@ -96,15 +103,22 @@ apache-stop:
 	else \
 	   killall apache2 2> /dev/null; \
 	fi
-	@sleep 0.3
+	@sleep 0.6
 	rm -f ${TMP_DIR}/mkws-jasmine.pid
 
 help:
 	@echo "make [ all | check | clean | distclean ]"
-	@echo "     [ phantomjs | screenshot ]"
-	@echo "     [ jsbeautifier | perltidy ]"
+	@echo "     [ phantomjs | phantomjs-all ]"
+	@echo "     [ jsbeautifier | perltidy | screenshot ]"
 	@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 ""
+	@echo "make phantomjs-all"
+	@echo ""