X-Git-Url: http://lists.indexdata.dk/cgi-bin?a=blobdiff_plain;f=test%2Fwidgets%2FMakefile;h=f1d13f22bb05bbd6b15cd09d7b9a78af3f23fc18;hb=b977aa0eac12c1d80b35e8d8a7a429377bcb6c7c;hp=ceacd0ced3ee0752497f7f7540312586f5e1fcd8;hpb=9c015e3a4061fd64f1d82edaf3b1dafd9a1ef032;p=mkws-moved-to-github.git

diff --git a/test/widgets/Makefile b/test/widgets/Makefile
index ceacd0c..f1d13f2 100644
--- a/test/widgets/Makefile
+++ b/test/widgets/Makefile
@@ -1,7 +1,7 @@
 # Copyright (c) 2013-2014 Index Data ApS. http://indexdata.com
 
 PHANTOMJS_TIMEOUT=30
-PHANTOMJS=	../node_modules/phantomjs/bin/phantomjs
+PHANTOMJS=	perl ../bin/bomb.pl --timeout=${PHANTOMJS_TIMEOUT} ../node_modules/phantomjs/bin/phantomjs
 IMAGES=		./images
 SCREENSHOT_WIDTH_HEIGHT=	1000 1200
 PERL_SCRIPTS=	../bin/bomb.pl
@@ -18,6 +18,7 @@ all: help
 
 clean:
 	rm -f index-*.html
+	rm -f iframe-*.html
 	rm -f ${IMAGES}/*.png
 
 distclean: clean
@@ -27,10 +28,11 @@ 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 iframe
+	set -e; \
 	for t in ${TESTS}; do \
 	    for i in $$(cat url.$$t); do \
 	    	${MAKE} PHANTOMJS_URL="$$i" TIMEOUT=4 PREFIX=$$t screenshot; \