X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=test%2FMakefile;h=3c420ea897a1d39808af757a229435749f052678;hb=c7d64cb5450f7587ff8e7c10d043eea9a57f4026;hp=6f6d637bf38da9f74a62159dabfc578a840cb3e0;hpb=9d52a0bf9dcc57cb339d42ca1e4b637894d507e5;p=mkws-moved-to-github.git diff --git a/test/Makefile b/test/Makefile index 6f6d637..3c420ea 100644 --- a/test/Makefile +++ b/test/Makefile @@ -46,9 +46,13 @@ test: check terse: $(MIKE) jasmine-node --noColor --captureExceptions --forceexit spec -phantomjs p: apache-stop apache-start +phantomjs p: apache-stop apache-start _phantomjs apache-stop + +_phantomjs: ./bin/bomb.pl --timeout="${PHANTOMJS_TIMEOUT}.5" ${PHANTOMJS} phantom/run-jasmine.js ${PHANTOMJS_URL} ${PHANTOMJS_TIMEOUT} - ${MAKE} apache-stop + +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 @@ -81,7 +85,7 @@ node_modules node-modules: apache-start: bin/apache-template-update ${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`; \