X-Git-Url: http://git.indexdata.com/?p=mkws-moved-to-github.git;a=blobdiff_plain;f=test%2FMakefile;h=57b5c4692dcdea18f995528f51f95c58c19048da;hp=044a04851ae0c2e3370f90fe2ce5b93f9695cffa;hb=792daf2373f2dd35eff60413d3cb7f5e5c1536b7;hpb=d1b3797a8a57899a13bb9c33a86ce333200acf3f

diff --git a/test/Makefile b/test/Makefile
index 044a048..57b5c46 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,16 +12,22 @@ 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:=	$(shell env PATH=$$PATH:/usr/sbin which apache2 httpd false | head -1 )
 
 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}
@@ -29,7 +35,7 @@ clean-tmp:
 	touch ${TMP_DIR}/.gitkeep
 
 mkws-complete-syntax-check:
-	${MAKE} -C../src mkws-complete.min.js
+	${MAKE} -C../tools/htdocs mkws-complete.min.js
 
 check: mkws-complete-syntax-check
 	@if [ ! -e node_modules ]; then echo "please run first: make node-modules"; exit 1; fi 
@@ -40,10 +46,15 @@ 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}
+phantomjs p: apache-stop apache-start _phantomjs 
 	${MAKE} apache-stop
 
+_phantomjs:
+	perl ./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
 
@@ -74,8 +85,8 @@ node_modules node-modules:
 
 apache-start:
 	bin/apache-template-update
-	/usr/sbin/apache2 -f `pwd`/../tools/apache2/jasmine-dev
-	
+	${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`; \
@@ -83,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 ]"
@@ -91,5 +103,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=12 PHANTOMJS_URL=${PHANTOMJS_URL}"