X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=test%2FMakefile;h=1114eef91a334d4eb6a8d0f587acbfa94abeda66;hb=184ab14937ca310e83cc36261753babb47b18af1;hp=4fbc15d9c860615e5a699c2bb18cdd409bb4604a;hpb=261f4f818ac4ed248902bb9b99172c41766620cd;p=mkws-moved-to-github.git

diff --git a/test/Makefile b/test/Makefile
index 4fbc15d..1114eef 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -1,4 +1,4 @@
-# Copyright (c) 2013-2014 IndexData ApS. http://indexdata.com
+# Copyright (c) 2013-2014 Index Data ApS. http://indexdata.com
 
 # For running on Mike's local install of node.js
 MIKE = PATH=$$PATH:/usr/local/lib/node-v0.10.24-linux-x64/bin
@@ -18,16 +18,17 @@ SCREENSHOT_WIDTH=	360 480 640 768 1024 1200 1440 2048
 PERL_SCRIPTS=	bin/bomb.pl
 TMP_DIR=	./logs
 APACHE_HTTPD:=	$(shell env PATH=$$PATH:/usr/sbin which apache2 httpd false | head -1 )
+APACHE_PORT ?= 4040
 
 all: check
 
 clean:
 	rm -f mkws-error.png mkws-error.html 
 	rm -f images/*.png
+	make -C./widgets $@
 
 distclean: clean clean-tmp clean-error
 	rm -rf node_modules
-	rm -f ${TMP_DIR}/jasmine-dev
 	rm -f libexec
 
 clean-error:
@@ -57,10 +58,10 @@ _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
+	${MAKE} phantomjs PHANTOMJS_PATH=jasmine-cors-popup.html
+	${MAKE} phantomjs PHANTOMJS_PATH=jasmine.html
 
 mike-test:
 	$(MAKE) _phantomjs PHANTOMJS_URL=http://x.example.indexdata.com/jasmine-popup.html
@@ -80,6 +81,9 @@ screenshot-indexdata:
 	done; wait
 	ls -l ${IMAGES}
 
+screenshots:
+	make -C ./widgets $@
+
 jsbeautifier jsb indent:
 	for i in package.json ./spec*/*.js ./js/*.js ./phantom/*.js; do \
 	  jsbeautifier -j $$i > $@.tmp && mv -f $@.tmp $$i; \
@@ -95,21 +99,23 @@ node_modules node-modules:
 
 apache-start:
 	bin/apache-template-update
-	${APACHE_HTTPD} -f `pwd`/${TMP_DIR}/jasmine-dev
+	${APACHE_HTTPD} -f `pwd`/${TMP_DIR}/jasmine-dev-${APACHE_PORT}.conf
 
+APACHE_PID_FILE=${TMP_DIR}/mkws-jasmine-${APACHE_PORT}.pid 
 apache-stop:
-	@-if [ -e ${TMP_DIR}/mkws-jasmine.pid ]; then \
-	   kill `cat ${TMP_DIR}/mkws-jasmine.pid`; \
+	@-if [ -e ${APACHE_PID_FILE} ]; then \
+	   kill `cat ${APACHE_PID_FILE}`; \
 	else \
 	   killall apache2 2> /dev/null; \
 	fi
 	@sleep 0.6
-	rm -f ${TMP_DIR}/mkws-jasmine.pid
+	rm -f ${APACHE_PID_FILE}
 
 help:
 	@echo "make [ all | check | clean | distclean ]"
 	@echo "     [ phantomjs | phantomjs-all ]"
 	@echo "     [ jsbeautifier | perltidy | screenshot ]"
+	@echo "     [ screenshots ]"
 	@echo "     [ node-modules ]"
 	@echo "     [ apache-stop apache-start ]"
 	@echo ""