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

diff --git a/test/Makefile b/test/Makefile
index dba1540..044a048 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -3,7 +3,8 @@
 # For running on Mike's local install of node.js
 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=https://mkws-dev.indexdata.com/jasmine-popup.html	
+PHANTOMJS_URL=http://localhost:4040/jasmine-popup.html
 PHANTOMJS_TIMEOUT=16
 
 NPM_INSTALL_FLAGS=-q
@@ -12,17 +13,23 @@ PHANTOMJS=	./node_modules/phantomjs/bin/phantomjs
 IMAGES=	./images
 SCREENSHOT_WIDTH=	360 480 640 768 1024 1200 1440 2048
 PERL_SCRIPTS=	bomb.pl
+TMP_DIR=	./logs
 
 all: check
 
 clean:
 	rm -f mkws-error.png mkws-error.html images/*.png
 
-distclean: clean
+distclean: clean clean-tmp
 	rm -rf node_modules
 
+clean-tmp:
+	rm -rf ${TMP_DIR}
+	mkdir -p ${TMP_DIR}
+	touch ${TMP_DIR}/.gitkeep
+
 mkws-complete-syntax-check:
-	${MAKE} -C../tools/htdocs $@
+	${MAKE} -C../src mkws-complete.min.js
 
 check: mkws-complete-syntax-check
 	@if [ ! -e node_modules ]; then echo "please run first: make node-modules"; exit 1; fi 
@@ -33,8 +40,9 @@ test: check
 terse:
 	$(MIKE) jasmine-node --noColor --captureExceptions --forceexit spec
 
-phantomjs p:
+phantomjs p: apache-stop apache-start
 	./bomb.pl --timeout="${PHANTOMJS_TIMEOUT}.5" ${PHANTOMJS} phantom/run-jasmine.js ${PHANTOMJS_URL} ${PHANTOMJS_TIMEOUT}
+	${MAKE} apache-stop
 
 screenshot:
 	${PHANTOMJS} phantom/screenshot.js ${PHANTOMJS_URL} ${IMAGES}/screenshot.png 1200 1000
@@ -64,11 +72,24 @@ perltidy:
 node_modules node-modules:
 	npm install ${NPM_INSTALL_FLAGS}
 
+apache-start:
+	bin/apache-template-update
+	/usr/sbin/apache2 -f `pwd`/../tools/apache2/jasmine-dev
+	
+apache-stop:
+	@-if [ -e ${TMP_DIR}/mkws-jasmine.pid ]; then \
+	   kill `cat ${TMP_DIR}/mkws-jasmine.pid`; \
+	else \
+	   killall apache2 2> /dev/null; \
+	fi
+	@sleep 0.3
+
 help:
 	@echo "make [ all | check | clean | distclean ]"
 	@echo "     [ phantomjs | screenshot ]"
 	@echo "     [ jsbeautifier | perltidy ]"
 	@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"