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
Merge remote branch 'origin/MKWS-229'
[mkws-moved-to-github.git]
/
test
/
Makefile
diff --git
a/test/Makefile
b/test/Makefile
index
125efa7
..
57b5c46
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 false | head -1 )
all: check
all: check
@@
-32,10
+32,10
@@
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:
mkws-complete-syntax-check:
- ${MAKE} -C../src mkws-complete.min.js
+ ${MAKE} -C../tools/htdocs mkws-complete.min.js
check: mkws-complete-syntax-check
@if [ ! -e node_modules ]; then echo "please run first: make node-modules"; exit 1; fi
check: mkws-complete-syntax-check
@if [ ! -e node_modules ]; then echo "please run first: make node-modules"; exit 1; fi
@@
-50,7
+50,7
@@
phantomjs p: apache-stop apache-start _phantomjs
${MAKE} apache-stop
_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
mike-test:
$(MAKE) _phantomjs PHANTOMJS_URL=http://x.example.indexdata.com/jasmine-popup.html
@@
-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}"