Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/mkws

diff --git a/test/widgets/Makefile b/test/widgets/Makefile
index 70a19c0..94ff158 100644 (file)
--- a/test/widgets/Makefile
+++ b/test/widgets/Makefile
@@ -7,7 +7,9 @@ SCREENSHOT_WIDTH_HEIGHT=        1000 1200
 PERL_SCRIPTS=  ../bin/bomb.pl
 PROG=  ../phantom/screenshot.js
 MD5=   $(shell which md5 md5sum)
-TIMEOUT=5
+TESTS= koha demos mike # koha.url
+TIMEOUT=4
+PREFIX=        test
 
 PHANTOMJS_URL= http://cph.koha.indexdata.com/cgi-bin/koha/opac-search.pl?q=sushi
 PHANTOMJS_URL= http://www.indexdata.com/
@@ -15,31 +17,40 @@ PHANTOMJS_URL=      http://www.indexdata.com/
 all: help
 
 clean:
-       rm -f mkws-error.png mkws-error.html 
-       rm -f ${IMAGES}/*.png ${IMAGES}/*.png.tmp
-       rm -f ${IMAGES}/index.html
+       rm -f index-*.html
+       rm -f ${IMAGES}/*.png
 
 distclean: clean
+       rm -f ${IMAGES}/*.png.tmp
 
 test: check
 
 screenshot:
-       file=$$(echo "${PHANTOMJS_URL}" | perl -npe 's,(\W),-,g'); \
+       file=${PREFIX}.$$(echo "${PHANTOMJS_URL}" | perl -npe 's,(\W),-,g; s/-$$//;'); \
          ${PHANTOMJS} ${PROG} ${PHANTOMJS_URL} ${IMAGES}/tmp.$$file.png ${SCREENSHOT_WIDTH_HEIGHT} ${TIMEOUT}; \
          mv -f  ${IMAGES}/tmp.$$file.png  ${IMAGES}/$$file.png
 
-screenshots: clean
-       for i in $$(cat url.txt); do \
-         ${MAKE} PHANTOMJS_URL="$$i" TIMEOUT=4 screenshot; \
-       done; wait
-       ${MAKE} index
+screenshots: clean estimate-time
+       for t in ${TESTS}; do \
+           for i in $$(cat url.$$t); do \
+               ${MAKE} PHANTOMJS_URL="$$i" TIMEOUT=4 PREFIX=$$t screenshot; \
+           done; \
+           ${MAKE} PREFIX=$$t index; \
+       done
+
+estimate-time:
+       @wc -l url.* | tail -n1 | awk '{print "Estimeate run time: " $$1 * (1 + '${TIMEOUT}'), "seconds" }'
+       @echo ""
 
 index:
-       cd ${IMAGES}; ls -tr *.png | perl -ne 'chomp; print qq{<h2>$$_</h2><img src="$$_"/><br/><br/><p/>\n}' > index.html
+       ( cd ${IMAGES}; ls -tr ${PREFIX}.*.png | perl -ne 'chomp; print qq{<h2>$$_</h2><img src="'${IMAGES}/'$$_"/><br/><br/><p/>\n}' ) > index-${PREFIX}.html
 
 help:
        @echo "make [ all | clean | distclean ]"
        @echo "     [ screenshots ]"
        @echo "     [ screenshot | index ]"
        @echo ""
+       @echo "Examples: "
+       @echo ""
+       @echo "make TESTS=mike screenshots"
 

diff --git a/test/widgets/url.demos b/test/widgets/url.demos
new file mode 100644 (file)
index 0000000..56db882
--- /dev/null
+++ b/test/widgets/url.demos
@@ -0,0 +1,5 @@
+http://example.indexdata.com/simple.html
+http://example.indexdata.com/minimal.html
+http://example.indexdata.com/language.html
+http://example.indexdata.com/mobile.html
+http://example.indexdata.com/lowlevel.html

diff --git a/test/widgets/url.koha b/test/widgets/url.koha
new file mode 100644 (file)
index 0000000..c5b8207
--- /dev/null
+++ b/test/widgets/url.koha
@@ -0,0 +1,7 @@
+http://cph.koha.indexdata.com/cgi-bin/koha/opac-search.pl?q=sushi
+http://demo.koha.indexdata.com/cgi-bin/koha/opac-search.pl?q=sushi
+http://demo.koha.indexdata.com/cgi-bin/koha/opac-search.pl?q=sushi2
+http://boston.koha.indexdata.com/cgi-bin/koha/opac-search.pl?q=sushi
+http://example.indexdata.com/topic.html?q=sushi
+http://example.indexdata.com/simple.html
+

diff --git a/test/widgets/url.mike b/test/widgets/url.mike
new file mode 100644 (file)
index 0000000..b865087
--- /dev/null
+++ b/test/widgets/url.mike
@@ -0,0 +1,2 @@
+http://zthes.z3950.org/
+http://sagp.miketaylor.org.uk/

diff --git a/test/widgets/url.txt b/test/widgets/url.txt
deleted file mode 100644 (file)
index c5b8207..0000000
--- a/test/widgets/url.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-http://cph.koha.indexdata.com/cgi-bin/koha/opac-search.pl?q=sushi
-http://demo.koha.indexdata.com/cgi-bin/koha/opac-search.pl?q=sushi
-http://demo.koha.indexdata.com/cgi-bin/koha/opac-search.pl?q=sushi2
-http://boston.koha.indexdata.com/cgi-bin/koha/opac-search.pl?q=sushi
-http://example.indexdata.com/topic.html?q=sushi
-http://example.indexdata.com/simple.html
-