X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=test%2FMakefile;h=3093d77c5c72428c71eb3ce658427812f038b943;hb=121c5c7346cfe29ff03606caa105f8cfa1809308;hp=e808d5526073bccdba4a5574d50ba06373352e53;hpb=25fc05e09abe4bdd0e0327f4870ca8aab4e97641;p=mkws-moved-to-github.git

diff --git a/test/Makefile b/test/Makefile
index e808d55..3093d77 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -6,8 +6,9 @@ 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:${APACHE_PORT}/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
@@ -27,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.*
@@ -54,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.html
+	#${MAKE} phantomjs PHANTOMJS_PATH=jasmine-cors-popup.html
+	${MAKE} phantomjs PHANTOMJS_PATH=jasmine-local-popup.html
+	${MAKE} phantomjs PHANTOMJS_PATH=jasmine-popup.html
+
 mike-test:
 	$(MAKE) _phantomjs PHANTOMJS_URL=http://x.example.indexdata.com/jasmine-popup.html
 
@@ -100,10 +108,17 @@ apache-stop:
 
 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 ""