X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=test%2FMakefile;h=125efa7ca4d2ba8719e172b23ad5e6d013ab4b45;hb=ac9e4a35a74918cd00feff5162d2e0e08c796d8f;hp=050528f391e70851c9dd6705026fdd6b1d9949e8;hpb=e07dba7446c2b0b281d671803d0dd1c869bac9c0;p=mkws-moved-to-github.git

diff --git a/test/Makefile b/test/Makefile
index 050528f..125efa7 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -46,11 +46,15 @@ test: check
 terse:
 	$(MIKE) jasmine-node --noColor --captureExceptions --forceexit spec
 
-phantomjs p: apache-stop apache-start _phantomjs apache-stop
+phantomjs p: apache-stop apache-start _phantomjs 
+	${MAKE} apache-stop
 
 _phantomjs:
 	./bin/bomb.pl --timeout="${PHANTOMJS_TIMEOUT}.5" ${PHANTOMJS} phantom/run-jasmine.js ${PHANTOMJS_URL} ${PHANTOMJS_TIMEOUT}
 
+mike-test:
+	$(MAKE) _phantomjs PHANTOMJS_URL=http://x.example.indexdata.com/jasmine-popup.html
+
 screenshot:
 	${PHANTOMJS} phantom/screenshot.js ${PHANTOMJS_URL} ${IMAGES}/screenshot.png 1200 1000
 
@@ -82,7 +86,7 @@ node_modules node-modules:
 apache-start:
 	bin/apache-template-update
 	${APACHE_HTTPD} -f `pwd`/${TMP_DIR}/jasmine-dev
-	
+
 apache-stop:
 	@-if [ -e ${TMP_DIR}/mkws-jasmine.pid ]; then \
 	   kill `cat ${TMP_DIR}/mkws-jasmine.pid`; \
@@ -90,6 +94,7 @@ apache-stop:
 	   killall apache2 2> /dev/null; \
 	fi
 	@sleep 0.3
+	rm -f ${TMP_DIR}/mkws-jasmine.pid
 
 help:
 	@echo "make [ all | check | clean | distclean ]"