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
668d855
..
77e1a6f
100644
(file)
--- a/
test/Makefile
+++ b/
test/Makefile
@@
-4,7
+4,7
@@
MIKE = PATH=$$PATH:/usr/local/lib/node-v0.10.24-linux-x64/bin
#PHANTOMJS_URL=https://mkws-dev.indexdata.com/jasmine-popup.html
MIKE = PATH=$$PATH:/usr/local/lib/node-v0.10.24-linux-x64/bin
#PHANTOMJS_URL=https://mkws-dev.indexdata.com/jasmine-popup.html
-PHANTOMJS_URL=http://localhost:4040/jasmine-popup.html
+PHANTOMJS_URL=http://localhost:4040/jasmine-local-popup.html
PHANTOMJS_TIMEOUT=16
NPM_INSTALL_FLAGS=-q
PHANTOMJS_TIMEOUT=16
NPM_INSTALL_FLAGS=-q
@@
-12,18
+12,23
@@
JASMINE_NODE= ./node_modules/jasmine-node/bin/jasmine-node
PHANTOMJS= ./node_modules/phantomjs/bin/phantomjs
IMAGES= ./images
SCREENSHOT_WIDTH= 360 480 640 768 1024 1200 1440 2048
PHANTOMJS= ./node_modules/phantomjs/bin/phantomjs
IMAGES= ./images
SCREENSHOT_WIDTH= 360 480 640 768 1024 1200 1440 2048
-PERL_SCRIPTS= bomb.pl
+PERL_SCRIPTS= bin/bomb.pl
TMP_DIR= ./logs
TMP_DIR= ./logs
+APACHE_HTTPD:= $(shell env PATH=$$PATH:/usr/sbin which apache2 httpd)
all: check
clean:
all: check
clean:
- rm -f mkws-error.png mkws-error.html images/*.png
+ rm -f mkws-error.png mkws-error.html
+ rm -f images/*.png
-distclean: clean clean-tmp
+distclean: clean clean-tmp clean-error
rm -rf node_modules
rm -f ${TMP_DIR}/jasmine-dev
rm -rf node_modules
rm -f ${TMP_DIR}/jasmine-dev
+clean-error:
+ rm -f mkws-error.png.* mkws-error.html.*
+
clean-tmp:
rm -rf ${TMP_DIR}
mkdir -p ${TMP_DIR}
clean-tmp:
rm -rf ${TMP_DIR}
mkdir -p ${TMP_DIR}
@@
-41,10
+46,15
@@
test: check
terse:
$(MIKE) jasmine-node --noColor --captureExceptions --forceexit spec
terse:
$(MIKE) jasmine-node --noColor --captureExceptions --forceexit spec
-phantomjs p: apache-stop apache-start
- ./bomb.pl --timeout="${PHANTOMJS_TIMEOUT}.5" ${PHANTOMJS} phantom/run-jasmine.js ${PHANTOMJS_URL} ${PHANTOMJS_TIMEOUT}
+phantomjs p: apache-stop apache-start _phantomjs
${MAKE} apache-stop
${MAKE} apache-stop
+_phantomjs:
+ ./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
+
screenshot:
${PHANTOMJS} phantom/screenshot.js ${PHANTOMJS_URL} ${IMAGES}/screenshot.png 1200 1000
screenshot:
${PHANTOMJS} phantom/screenshot.js ${PHANTOMJS_URL} ${IMAGES}/screenshot.png 1200 1000
@@
-75,8
+85,8
@@
node_modules node-modules:
apache-start:
bin/apache-template-update
apache-start:
bin/apache-template-update
- /usr/sbin/apache2 -f `pwd`/${TMP_DIR}/jasmine-dev
-
+ ${APACHE_HTTPD} -f `pwd`/${TMP_DIR}/jasmine-dev
+
apache-stop:
@-if [ -e ${TMP_DIR}/mkws-jasmine.pid ]; then \
kill `cat ${TMP_DIR}/mkws-jasmine.pid`; \
apache-stop:
@-if [ -e ${TMP_DIR}/mkws-jasmine.pid ]; then \
kill `cat ${TMP_DIR}/mkws-jasmine.pid`; \
@@
-84,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 ]"
@@
-92,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=https://mkws-dev.indexdata.com/jasmine-popup.html"
+ @echo "DEBUG=1 make phantomjs PHANTOMJS_TIMEOUT=12 PHANTOMJS_URL=${PHANTOMJS_URL}"