X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=test%2Fwidgets%2FMakefile;h=b59bf67813086e76efc91dbdb9efd5e070a2e49a;hb=928e582912ca5fcddd5a8c70c559bb97d1acdbff;hp=e2d3581537bb71eb1a8d8021d95e9c28a090b115;hpb=46e072ebe19e86e9b56203790aad6a765cc179c6;p=mkws-moved-to-github.git

diff --git a/test/widgets/Makefile b/test/widgets/Makefile
index e2d3581..b59bf67 100644
--- a/test/widgets/Makefile
+++ b/test/widgets/Makefile
@@ -28,19 +28,25 @@ 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; \
-	    done; \
+	    	${MAKE} PHANTOMJS_URL="$$i" TIMEOUT=4 PREFIX=$$t screenshot & sleep 1; \
+	    done; wait; \
 	    ${MAKE} PREFIX=$$t index; \
 	done
+	${MAKE} tidy help-url
+
+help-url:
+	@echo ""
+	@echo "Please check now: http://localhost/test/widgets/"
 
 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:
@@ -50,10 +56,16 @@ 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
 
+tidy:
+	for i in iframe-demos.html index-*.html; do \
+	    tidy -i -m $$i >/dev/null 2>&1; \
+	    perl -i -npe 's,(^\s*</head>),<link type="text/css" rel="stylesheet" href="screenshots.css" /> $$1,' $$i; \
+	done
+
 help:
 	@echo "make [ all | clean | distclean ]"
 	@echo "     [ screenshots ]"
-	@echo "     [ screenshot | index | iframe ]"
+	@echo "     [ screenshot | index | iframe | tidy ]"
 	@echo ""
 	@echo "Examples: "
 	@echo ""