X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=test%2FMakefile;h=a1142b12ce80a713e934eaccf38bda8d20b5cdf0;hb=77fe60135f3526111f8cc3922af1bd3bc77e6f8c;hp=dc105ecf38113864b9480e3897ec5864291088b6;hpb=b49155c7403dd3b19f72032a6c1da5ff519873ca;p=mkws-moved-to-github.git

diff --git a/test/Makefile b/test/Makefile
index dc105ec..a1142b1 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -14,6 +14,7 @@ IMAGES=	./images
 SCREENSHOT_WIDTH=	360 480 640 768 1024 1200 1440 2048
 PERL_SCRIPTS=	bomb.pl
 TMP_DIR=	./logs
+APACHE_HTTPD=	/usr/sbin/apache2
 
 all: check
 
@@ -22,6 +23,7 @@ clean:
 
 distclean: clean clean-tmp
 	rm -rf node_modules
+	rm -f ${TMP_DIR}/jasmine-dev
 
 clean-tmp:
 	rm -rf ${TMP_DIR}
@@ -74,15 +76,15 @@ node_modules node-modules:
 
 apache-start:
 	bin/apache-template-update
-	/usr/sbin/apache2 -f `pwd`/../tools/apache2/jasmine-dev
+	${APACHE_HTTPD} -f `pwd`/${TMP_DIR}/jasmine-dev
 	
 apache-stop:
-	-if [ -e ${TMP_DIR}/mkws-jasmine.pid ]; then \
+	@-if [ -e ${TMP_DIR}/mkws-jasmine.pid ]; then \
 	   kill `cat ${TMP_DIR}/mkws-jasmine.pid`; \
 	else \
 	   killall apache2 2> /dev/null; \
 	fi
-	sleep 0.3
+	@sleep 0.3
 
 help:
 	@echo "make [ all | check | clean | distclean ]"
@@ -91,5 +93,5 @@ help:
 	@echo "     [ node-modules ]"
 	@echo "     [ apache-stop apache-start ]"
 	@echo ""
-	@echo "DEBUG=1 make phantomjs PHANTOMJS_TIMEOUT=8 PHANTOMJS_URL=https://mkws-dev.indexdata.com/jasmine-popup.html"
+	@echo "DEBUG=1 make phantomjs PHANTOMJS_TIMEOUT=8 PHANTOMJS_URL=${PHANTOMJS_URL}"