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
increase example timeout from 8 to 12 seconds
[mkws-moved-to-github.git]
/
test
/
Makefile
diff --git
a/test/Makefile
b/test/Makefile
index
3c420ea
..
77e1a6f
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= /usr/sbin/apache2
+APACHE_HTTPD:= $(shell env PATH=$$PATH:/usr/sbin which apache2 httpd)
all: check
all: check
@@
-32,7
+32,7
@@
clean-error:
clean-tmp:
rm -rf ${TMP_DIR}
mkdir -p ${TMP_DIR}
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
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
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}
_phantomjs:
./bin/bomb.pl --timeout="${PHANTOMJS_TIMEOUT}.5" ${PHANTOMJS} phantom/run-jasmine.js ${PHANTOMJS_URL} ${PHANTOMJS_TIMEOUT}
@@
-93,6
+94,7
@@
apache-stop:
killall apache2 2> /dev/null; \
fi
@sleep 0.3
killall apache2 2> /dev/null; \
fi
@sleep 0.3
+ rm -f ${TMP_DIR}/mkws-jasmine.pid
help:
@echo "make [ all | check | clean | distclean ]"
help:
@echo "make [ all | check | clean | distclean ]"
@@
-101,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}"