X-Git-Url: http://git.indexdata.com/?p=mkws-moved-to-github.git;a=blobdiff_plain;f=test%2Fwidgets%2FMakefile;h=55467fb6a1a94dcd72d685d4b7a3e49a2d17bbf6;hp=e2a181032fda631c99d51f6271ec7e99bdc5c016;hb=662315e99481a373415236ab3a191728ec8bf1bd;hpb=9c2d46e6385d3c6b08849778a712614afb4bca76

diff --git a/test/widgets/Makefile b/test/widgets/Makefile
index e2a1810..55467fb 100644
--- a/test/widgets/Makefile
+++ b/test/widgets/Makefile
@@ -31,31 +31,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
+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
-	@echo "Please check now: http://localhost/test/widgets/"
+	${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{<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: