X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=test%2Fwidgets%2FMakefile;h=800ea5c6c6e163c2b56f29a264ea3cd815bce477;hb=1fc47034435ae04af15199ba0670031e56909b35;hp=39aaadaa80c1a9d8b5d72ef60d52ef1bfa7d9fe2;hpb=73477566f442547598f213c19d28272aec4d7a10;p=mkws-moved-to-github.git diff --git a/test/widgets/Makefile b/test/widgets/Makefile index 39aaada..800ea5c 100644 --- a/test/widgets/Makefile +++ b/test/widgets/Makefile @@ -1,10 +1,9 @@ # Copyright (c) 2013-2014 Index Data ApS. http://indexdata.com -PHANTOMJS_TIMEOUT=18 -PHANTOMJS= ../node_modules/phantomjs/bin/phantomjs +PHANTOMJS_TIMEOUT=30 +PHANTOMJS= ../bin/bomb --timeout=${PHANTOMJS_TIMEOUT} ../node_modules/phantomjs/bin/phantomjs IMAGES= ./images SCREENSHOT_WIDTH_HEIGHT= 1000 1200 -PERL_SCRIPTS= ../bin/bomb.pl PROG= ../phantom/screenshot.js MD5= $(shell which md5 md5sum) TESTS= koha demos mike # koha.url @@ -18,6 +17,7 @@ all: help clean: rm -f index-*.html + rm -f iframe-*.html rm -f ${IMAGES}/*.png distclean: clean @@ -27,28 +27,50 @@ test: check screenshot: file=${PREFIX}.$$(echo "${PHANTOMJS_URL}" | perl -npe 's,(\W),-,g; s/-$$//;'); \ - ${PHANTOMJS} ${PROG} ${PHANTOMJS_URL} ${IMAGES}/tmp.$$file.png ${SCREENSHOT_WIDTH_HEIGHT} ${TIMEOUT}; \ + ${PHANTOMJS} ${PROG} "${PHANTOMJS_URL}" ${IMAGES}/tmp.$$file.png ${SCREENSHOT_WIDTH_HEIGHT} ${TIMEOUT}; \ mv -f ${IMAGES}/tmp.$$file.png ${IMAGES}/$$file.png -screenshots: clean estimate-time +screenshots: clean estimate-time iframe + set -e; \ for t in ${TESTS}; do \ for i in $$(cat url.$$t); do \ - ${MAKE} PHANTOMJS_URL="$$i" TIMEOUT=4 PREFIX=$$t screenshot; \ - done; \ + ${MAKE} PHANTOMJS_URL="$$i" TIMEOUT=4 PREFIX=$$t screenshot & sleep 1; \ + done; wait; \ ${MAKE} PREFIX=$$t index; \ done + ${MAKE} index-widgets tidy help-url + +help-url: + @echo "" + @echo "Please check now: http://localhost/test/widgets/index.html" estimate-time: - @wc -l url.* | tail -n1 | awk '{print "Estimeate run time: " $$1 * (1 + '${TIMEOUT}'), "seconds" }' + @wc -l url.* | tail -n1 | awk '{print "Estimeate run time: " $$1 * (1 + '${TIMEOUT}') * 0.5, "seconds" }' @echo "" index: ( cd ${IMAGES}; ls -tr ${PREFIX}.*.png | perl -ne 'chomp; print qq{