X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=test%2Fwidgets%2FMakefile;h=800ea5c6c6e163c2b56f29a264ea3cd815bce477;hb=1fc47034435ae04af15199ba0670031e56909b35;hp=846ed1893b440bc4f6bddbc3cee08e909106f062;hpb=eb09652190ced9bccb92dc45a4f71d7bb8d0a430;p=mkws-moved-to-github.git

diff --git a/test/widgets/Makefile b/test/widgets/Makefile
index 846ed18..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=30
-PHANTOMJS=	perl ../bin/bomb.pl --timeout=${PHANTOMJS_TIMEOUT} ../node_modules/phantomjs/bin/phantomjs
+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
@@ -31,34 +30,39 @@ screenshot:
 	  ${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 tidy help-url
+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/"
+	@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{<h2>$$_</h2><img src="'${IMAGES}/'$$_"/><br/><br/><p/>\n}' ) > index-${PREFIX}.html
 
+index-widgets:
+	ls -t index-*html iframe-*.html | perl -ne 'chomp; print qq{<a href="$$_">$$_</a><br/>\n}' > index.html
+
 iframe: index-iframe-demo
 index-iframe-demo:
-	( cat url.demos | perl -ne 'chomp; print qq{<h2>$$_</h2><iframe width="900px" height="600px" src="$$_"></iframe>\n}' ) > iframe-demos.html
+	( egrep example.indexdata.com url.demos | perl -ne 'chomp; print qq{<h2>$$_</h2><iframe width="900px" height="600px" src="$$_"></iframe>\n}' ) > iframe-demos-example.html
+	( egrep -v example.indexdata.com url.demos | perl -ne 'chomp; print qq{<h2>$$_</h2><iframe width="900px" height="600px" src="$$_"></iframe>\n}' ) > iframe-demos-other.html
 
 tidy:
-	for i in iframe-demos.html index-*.html; do \
+	for i in iframe-demos*.html index*.html; do \
 	    tidy -i -m $$i >/dev/null 2>&1; \
-	    perl -i -npe 's,(</head>),<link type="text/css" rel="stylesheet" href="screenshots.css" />\n$$1,' $$i; \
+	    perl -i -npe 's,(^\s*</head>),<link type="text/css" rel="stylesheet" href="screenshots.css" /> $$1,' $$i; \
 	done
 
 help: