X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=test%2FMakefile;h=95a3c7b79e2def8503434c05e25e1c10e6acc44e;hb=56483f51c428061a708d8cdf6eba624db7abeaa5;hp=77e1a6fa5bc17a41519a33b5e1e9f5e07a84f5ae;hpb=66237ce903a2979d413d87cedc7c303489c24a68;p=mkws-moved-to-github.git

diff --git a/test/Makefile b/test/Makefile
index 77e1a6f..95a3c7b 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:=	$(shell env PATH=$$PATH:/usr/sbin which apache2 httpd)
+APACHE_HTTPD:=	$(shell env PATH=$$PATH:/usr/sbin which apache2 httpd false | head -1 )
 
 all: check
 
@@ -50,7 +50,7 @@ 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}
+	perl ./bin/bomb.pl --timeout="${PHANTOMJS_TIMEOUT}.5" ${PHANTOMJS} phantom/run-jasmine.js ${PHANTOMJS_URL} ${PHANTOMJS_TIMEOUT}
 
 mike-test:
 	$(MAKE) _phantomjs PHANTOMJS_URL=http://x.example.indexdata.com/jasmine-popup.html