Move "required development tools" section from top-level README into
[mkws-moved-to-github.git] / test / Makefile
index 89c0c02..65fbc3e 100644 (file)
@@ -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
@@ -57,10 +57,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
@@ -103,7 +103,7 @@ apache-stop:
        else \
           killall apache2 2> /dev/null; \
        fi
-       @sleep 0.3
+       @sleep 0.6
        rm -f ${TMP_DIR}/mkws-jasmine.pid
 
 help: