X-Git-Url: http://sru.miketaylor.org.uk/?a=blobdiff_plain;f=test%2FMakefile;h=1f6060cc3d6ca533b028942029bd783dd3a22d98;hb=adf8829783dba8d38fa5a05814e049a2a107fd2e;hp=69e446ccf115b921ed89dc70991979a554b0f371;hpb=68b956a49e8ca13bde2934af62f014f7c9138594;p=mkws-moved-to-github.git

diff --git a/test/Makefile b/test/Makefile
index 69e446c..1f6060c 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -42,13 +42,15 @@ clean-tmp:
 mkws-complete-syntax-check:
 	${MAKE} -C../src ../tools/htdocs/mkws-complete.min.js
 
-check check-js: mkws-complete-syntax-check
+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
-	${JASMINE_NODE} --noColor --captureExceptions --forceexit ./spec
 
 test: check
 
@@ -103,14 +105,14 @@ node_modules node-modules:
 
 apache-start:
 	bin/apache-template-update
-	${APACHE_HTTPD} -f `pwd`/${TMP_DIR}/jasmine-dev-${APACHE_PORT}.conf
+	umask 002; ${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 ${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}