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

diff --git a/test/widgets/Makefile b/test/widgets/Makefile
index e2d3581..f1d13f2 100644 (file)
--- a/test/widgets/Makefile
+++ b/test/widgets/Makefile
@@ -28,10 +28,11 @@ 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; \