cleanup widgets

[mkws-moved-to-github.git] / test / Makefile

diff --git a/test/Makefile b/test/Makefile
index 89c0c02..d4597df 100644 (file)
--- a/test/Makefile
+++ b/test/Makefile
@@ -1,4 +1,4 @@
-# Copyright (c) 2013-2014 IndexData ApS. http://indexdata.com
+# Copyright (c) 2013-2014 Index Data ApS. http://indexdata.com
 
 # For running on Mike's local install of node.js
 MIKE = PATH=$$PATH:/usr/local/lib/node-v0.10.24-linux-x64/bin
@@ -29,6 +29,7 @@ distclean: clean clean-tmp clean-error
        rm -rf node_modules
        rm -f ${TMP_DIR}/jasmine-dev
        rm -f libexec
+       make -C./widgets $@
 
 clean-error:
        rm -f mkws-error.png.* mkws-error.html.*
@@ -57,10 +58,10 @@ _phantomjs:
        perl ./bin/bomb.pl --timeout="${PHANTOMJS_TIMEOUT}.5" ${PHANTOMJS} phantom/run-jasmine.js ${PHANTOMJS_URL} ${PHANTOMJS_TIMEOUT}
 
 phantomjs-all p-all:
-       ${MAKE} phantomjs PHANTOMJS_PATH=jasmine.html
-       ${MAKE} phantomjs PHANTOMJS_PATH=jasmine-cors-popup.html
        ${MAKE} phantomjs PHANTOMJS_PATH=jasmine-local-popup.html
        ${MAKE} phantomjs PHANTOMJS_PATH=jasmine-popup.html
+       ${MAKE} phantomjs PHANTOMJS_PATH=jasmine-cors-popup.html
+       ${MAKE} phantomjs PHANTOMJS_PATH=jasmine.html
 
 mike-test:
        $(MAKE) _phantomjs PHANTOMJS_URL=http://x.example.indexdata.com/jasmine-popup.html
@@ -80,6 +81,9 @@ screenshot-indexdata:
        done; wait
        ls -l ${IMAGES}
 
+screenshots:
+       make -C ./widgets $@
+
 jsbeautifier jsb indent:
        for i in package.json ./spec*/*.js ./js/*.js ./phantom/*.js; do \
          jsbeautifier -j $$i > $@.tmp && mv -f $@.tmp $$i; \
@@ -103,13 +107,14 @@ apache-stop:
        else \
           killall apache2 2> /dev/null; \
        fi
-       @sleep 0.3
+       @sleep 0.6
        rm -f ${TMP_DIR}/mkws-jasmine.pid
 
 help:
        @echo "make [ all | check | clean | distclean ]"
        @echo "     [ phantomjs | phantomjs-all ]"
        @echo "     [ jsbeautifier | perltidy | screenshot ]"
+       @echo "     [ screenshots ]"
        @echo "     [ node-modules ]"
        @echo "     [ apache-stop apache-start ]"
        @echo ""