X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=test%2Fwidgets%2FMakefile;h=70a19c0c3a52902d3bf09a008a8331320a0d56c4;hb=b5cee14f163b48d8da1bded7120dee1eb6323b72;hp=0cd4805efa11b67bc567c42c1745167cb0d526da;hpb=071252b434b22d16ee1c18db2ae5c8615ef9f993;p=mkws-moved-to-github.git

diff --git a/test/widgets/Makefile b/test/widgets/Makefile
index 0cd4805..70a19c0 100644
--- a/test/widgets/Makefile
+++ b/test/widgets/Makefile
@@ -16,7 +16,7 @@ all: help
 
 clean:
 	rm -f mkws-error.png mkws-error.html 
-	rm -f ${IMAGES}/*.png
+	rm -f ${IMAGES}/*.png ${IMAGES}/*.png.tmp
 	rm -f ${IMAGES}/index.html
 
 distclean: clean
@@ -24,17 +24,18 @@ distclean: clean
 test: check
 
 screenshot:
-	file=$$(echo "${PHANTOMJS_URL}" | ${MD5} | perl -npe 's,\s.*,,'); \
-	${PHANTOMJS} ${PROG} ${PHANTOMJS_URL} ${IMAGES}/$$file.png ${SCREENSHOT_WIDTH_HEIGHT} ${TIMEOUT}
+	file=$$(echo "${PHANTOMJS_URL}" | perl -npe 's,(\W),-,g'); \
+	  ${PHANTOMJS} ${PROG} ${PHANTOMJS_URL} ${IMAGES}/tmp.$$file.png ${SCREENSHOT_WIDTH_HEIGHT} ${TIMEOUT}; \
+	  mv -f  ${IMAGES}/tmp.$$file.png  ${IMAGES}/$$file.png
 
-screenshots:
+screenshots: clean
 	for i in $$(cat url.txt); do \
-	  make PHANTOMJS_URL="$$i" TIMEOUT=4 screenshot; \
+	  ${MAKE} PHANTOMJS_URL="$$i" TIMEOUT=4 screenshot; \
 	done; wait
-	make index
+	${MAKE} index
 
 index:
-	cd ${IMAGES}; ls *.png | perl -ne 'chomp; print qq{<img src="$$_">$$_</img><hr/>\n}' > index.html
+	cd ${IMAGES}; ls -tr *.png | perl -ne 'chomp; print qq{<h2>$$_</h2><img src="$$_"/><br/><br/><p/>\n}' > index.html
 
 help:
 	@echo "make [ all | clean | distclean ]"