projects
/
mkws-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix last commit
[mkws-moved-to-github.git]
/
test
/
Makefile
diff --git
a/test/Makefile
b/test/Makefile
index
45c3422
..
9ee3b80
100644
(file)
--- 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
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
all: check
@@
-103,5
+103,5
@@
help:
@echo " [ node-modules ]"
@echo " [ apache-stop apache-start ]"
@echo ""
@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}"