X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=test%2FMakefile;h=9ee3b804b3584d04a65442ef50c5eee2bc820314;hb=33587b3b07b0e4b8a9ce09d340114ded913722d2;hp=45c3422892f7824933dd70850b1cd7dcbec6c747;hpb=bb114f7100e91415d45a6ee031d2ffd24c2d8367;p=mkws-moved-to-github.git diff --git a/test/Makefile b/test/Makefile index 45c3422..9ee3b80 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 @@ -103,5 +103,5 @@ help: @echo " [ node-modules ]" @echo " [ apache-stop apache-start ]" @echo "" - @echo "DEBUG=1 make phantomjs PHANTOMJS_TIMEOUT=8 PHANTOMJS_URL=${PHANTOMJS_URL}" + @echo "DEBUG=1 make phantomjs PHANTOMJS_TIMEOUT=12 PHANTOMJS_URL=${PHANTOMJS_URL}"