X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=test%2FMakefile;h=b89b4e1d513d0b10f28a363c0e127b424eb29e4f;hb=d802e65ded779b553d1055703d424cb5b2e5b7b9;hp=668d855f9205ba5a6a67c2e41427b5e8eef21c0e;hpb=54f01e1910f918a990a38c6108356f27dbc7b049;p=mkws-moved-to-github.git

diff --git a/test/Makefile b/test/Makefile
index 668d855..b89b4e1 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -4,7 +4,7 @@
 MIKE = PATH=$$PATH:/usr/local/lib/node-v0.10.24-linux-x64/bin
 
 #PHANTOMJS_URL=https://mkws-dev.indexdata.com/jasmine-popup.html	
-PHANTOMJS_URL=http://localhost:4040/jasmine-popup.html
+PHANTOMJS_URL=http://localhost:4040/jasmine-local-popup.html
 PHANTOMJS_TIMEOUT=16
 
 NPM_INSTALL_FLAGS=-q
@@ -12,22 +12,27 @@ JASMINE_NODE=	./node_modules/jasmine-node/bin/jasmine-node
 PHANTOMJS=	./node_modules/phantomjs/bin/phantomjs
 IMAGES=	./images
 SCREENSHOT_WIDTH=	360 480 640 768 1024 1200 1440 2048
-PERL_SCRIPTS=	bomb.pl
+PERL_SCRIPTS=	bin/bomb.pl
 TMP_DIR=	./logs
+APACHE_HTTPD=	/usr/sbin/apache2
 
 all: check
 
 clean:
-	rm -f mkws-error.png mkws-error.html images/*.png
+	rm -f mkws-error.png mkws-error.html 
+	rm -f images/*.png
 
-distclean: clean clean-tmp
+distclean: clean clean-tmp clean-error
 	rm -rf node_modules
 	rm -f ${TMP_DIR}/jasmine-dev
 
+clean-error:
+	rm -f mkws-error.png.* mkws-error.html.*
+
 clean-tmp:
 	rm -rf ${TMP_DIR}
 	mkdir -p ${TMP_DIR}
-	touch ${TMP_DIR}/.gitkeep
+	touch ${TMP_DIR}/.gitignore
 
 mkws-complete-syntax-check:
 	${MAKE} -C../src mkws-complete.min.js
@@ -41,9 +46,13 @@ test: check
 terse:
 	$(MIKE) jasmine-node --noColor --captureExceptions --forceexit spec
 
-phantomjs p: apache-stop apache-start
-	./bomb.pl --timeout="${PHANTOMJS_TIMEOUT}.5" ${PHANTOMJS} phantom/run-jasmine.js ${PHANTOMJS_URL} ${PHANTOMJS_TIMEOUT}
-	${MAKE} apache-stop
+phantomjs p: apache-stop apache-start _phantomjs 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
@@ -75,7 +84,7 @@ node_modules node-modules:
 
 apache-start:
 	bin/apache-template-update
-	/usr/sbin/apache2 -f `pwd`/${TMP_DIR}/jasmine-dev
+	${APACHE_HTTPD} -f `pwd`/${TMP_DIR}/jasmine-dev
 	
 apache-stop:
 	@-if [ -e ${TMP_DIR}/mkws-jasmine.pid ]; then \
@@ -92,5 +101,5 @@ help:
 	@echo "     [ node-modules ]"
 	@echo "     [ apache-stop apache-start ]"
 	@echo ""
-	@echo "DEBUG=1 make phantomjs PHANTOMJS_TIMEOUT=8 PHANTOMJS_URL=https://mkws-dev.indexdata.com/jasmine-popup.html"
+	@echo "DEBUG=1 make phantomjs PHANTOMJS_TIMEOUT=8 PHANTOMJS_URL=${PHANTOMJS_URL}"