X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=test%2FMakefile;h=5705e4d02663fa7980ddaa23df6c1eb4146907b3;hb=2ad37a64bff1892127a781d6bf8f9c2009f8b32c;hp=dacc8f80158f042d687c49e840bef762568d228b;hpb=4eb5d537fe498f8105779ce62c239c40a2bdf623;p=mkws-moved-to-github.git

diff --git a/test/Makefile b/test/Makefile
index dacc8f8..5705e4d 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -5,7 +5,7 @@ MIKE = PATH=$$PATH:/usr/local/lib/node-v0.10.24-linux-x64/bin
 
 APACHE_PORT:= $(shell echo $${APACHE_PORT-4040})
 
-#PHANTOMJS_URL=https://mkws-dev.indexdata.com/jasmine-popup.html	
+#PHANTOMJS_URL=https://mkws-dev.indexdata.com/jasmine-popup.html
 PHANTOMJS_PATH=jasmine-local-popup.html
 PHANTOMJS_URL=http://localhost:${APACHE_PORT}/${PHANTOMJS_PATH}
 PHANTOMJS_TIMEOUT=18
@@ -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 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:
@@ -39,10 +40,14 @@ clean-tmp:
 	touch ${TMP_DIR}/.gitkeep
 
 mkws-complete-syntax-check:
-	${MAKE} -C../tools/htdocs mkws-complete.min.js
+	${MAKE} -C../src ../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 
+check check-js: mkws-complete-syntax-check
+	@if [ ! -e node_modules ]; then \
+	    echo "==> please run first: make node-modules"; \
+	    echo ""; \
+	    exit 1; \
+	fi
 	${JASMINE_NODE} --noColor --captureExceptions --forceexit ./spec
 
 test: check
@@ -50,7 +55,7 @@ test: check
 terse:
 	$(MIKE) jasmine-node --noColor --captureExceptions --forceexit spec
 
-phantomjs p: apache-stop apache-start _phantomjs 
+phantomjs p: check-js apache-stop apache-start _phantomjs
 	${MAKE} apache-stop
 
 _phantomjs:
@@ -81,7 +86,7 @@ screenshot-indexdata:
 	ls -l ${IMAGES}
 
 screenshots:
-	make -C ./widgets $@
+	${MAKE} -C ./widgets $@
 
 jsbeautifier jsb indent:
 	for i in package.json ./spec*/*.js ./js/*.js ./phantom/*.js; do \
@@ -98,16 +103,17 @@ 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 ]"
@@ -123,6 +129,6 @@ help:
 	@echo "DEBUG=0 APACHE_PORT=5050 make -s phantomjs PHANTOMJS_TIMEOUT=12 PHANTOMJS_PATH=${PHANTOMJS_PATH}"
 	@echo "DEBUG=2 make phantomjs PHANTOMJS_TIMEOUT=12 PHANTOMJS_URL=${PHANTOMJS_URL}"
 	@echo ""
+	@echo "make APACHE_PORT=5050 apache-start"
 	@echo "make phantomjs-all"
 	@echo ""
-