X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=test%2FMakefile;h=1b986b4829c0334a8930638bdc8627d2069baa62;hb=87f71ca01b619b8d613407cb3fcbb91d12d932fe;hp=e4606ba7563242851484c8d2edb75d7d78fa94e6;hpb=93ac8ea2792b56c6da56b83af6292a2db1244f9f;p=mkws-moved-to-github.git

diff --git a/test/Makefile b/test/Makefile
index e4606ba..1b986b4 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -5,10 +5,10 @@ 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
+PHANTOMJS_TIMEOUT=30
 
 NPM_INSTALL_FLAGS=-q
 JASMINE_NODE=	./node_modules/jasmine-node/bin/jasmine-node
@@ -23,11 +23,11 @@ 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
+distclean: apache-stop clean clean-tmp clean-error
 	rm -rf node_modules
 	rm -f libexec
 
@@ -42,16 +42,22 @@ clean-tmp:
 mkws-complete-syntax-check:
 	${MAKE} -C../src ../tools/htdocs/mkws-complete.min.js
 
-check check-js: mkws-complete-syntax-check
-	@if [ ! -e node_modules ]; then echo "please run first: make node-modules"; exit 1; fi 
+check check-js: node-modules mkws-complete-syntax-check
 	${JASMINE_NODE} --noColor --captureExceptions --forceexit ./spec
 
+check-node-installation:
+	@if [ ! -e node_modules ]; then \
+	    echo "==> please run first: make node-modules"; \
+	    echo ""; \
+	    exit 1; \
+	fi
+
 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:
@@ -101,12 +107,12 @@ apache-start:
 	bin/apache-template-update
 	${APACHE_HTTPD} -f `pwd`/${TMP_DIR}/jasmine-dev-${APACHE_PORT}.conf
 
-APACHE_PID_FILE=${TMP_DIR}/mkws-jasmine-${APACHE_PORT}.pid 
+APACHE_PID_FILE=${TMP_DIR}/mkws-jasmine-${APACHE_PORT}.pid
 apache-stop:
 	@-if [ -e ${APACHE_PID_FILE} ]; then \
 	   kill `cat ${APACHE_PID_FILE}`; \
 	else \
-	   killall apache2 2> /dev/null; \
+	   killall ${APACHE_HTTPD} 2> /dev/null; \
 	fi
 	@sleep 0.6
 	rm -f ${APACHE_PID_FILE}
@@ -125,6 +131,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 ""
-