X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=test%2FMakefile;h=45c3422892f7824933dd70850b1cd7dcbec6c747;hb=e96b7f197834281f3343a52d8902cff9381faf52;hp=b89b4e1d513d0b10f28a363c0e127b424eb29e4f;hpb=d802e65ded779b553d1055703d424cb5b2e5b7b9;p=mkws-moved-to-github.git

diff --git a/test/Makefile b/test/Makefile
index b89b4e1..45c3422 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -14,7 +14,7 @@ IMAGES=	./images
 SCREENSHOT_WIDTH=	360 480 640 768 1024 1200 1440 2048
 PERL_SCRIPTS=	bin/bomb.pl
 TMP_DIR=	./logs
-APACHE_HTTPD=	/usr/sbin/apache2
+APACHE_HTTPD:=	$(shell env PATH=$$PATH:/usr/sbin which apache2 httpd)
 
 all: check
 
@@ -32,7 +32,7 @@ clean-error:
 clean-tmp:
 	rm -rf ${TMP_DIR}
 	mkdir -p ${TMP_DIR}
-	touch ${TMP_DIR}/.gitignore
+	touch ${TMP_DIR}/.gitkeep
 
 mkws-complete-syntax-check:
 	${MAKE} -C../src mkws-complete.min.js
@@ -46,7 +46,8 @@ test: check
 terse:
 	$(MIKE) jasmine-node --noColor --captureExceptions --forceexit spec
 
-phantomjs p: apache-stop apache-start _phantomjs apache-stop
+phantomjs p: apache-stop apache-start _phantomjs 
+	${MAKE} apache-stop
 
 _phantomjs:
 	./bin/bomb.pl --timeout="${PHANTOMJS_TIMEOUT}.5" ${PHANTOMJS} phantom/run-jasmine.js ${PHANTOMJS_URL} ${PHANTOMJS_TIMEOUT}
@@ -85,7 +86,7 @@ node_modules node-modules:
 apache-start:
 	bin/apache-template-update
 	${APACHE_HTTPD} -f `pwd`/${TMP_DIR}/jasmine-dev
-	
+
 apache-stop:
 	@-if [ -e ${TMP_DIR}/mkws-jasmine.pid ]; then \
 	   kill `cat ${TMP_DIR}/mkws-jasmine.pid`; \
@@ -93,6 +94,7 @@ apache-stop:
 	   killall apache2 2> /dev/null; \
 	fi
 	@sleep 0.3
+	rm -f ${TMP_DIR}/mkws-jasmine.pid
 
 help:
 	@echo "make [ all | check | clean | distclean ]"