X-Git-Url: http://sru.miketaylor.org.uk/?a=blobdiff_plain;f=test%2FMakefile;h=36351a6054202843c01b25626fe4b1219d84a67f;hb=8111bf5133e4335ae1b14a79470d44b4c7003ce0;hp=3093d77c5c72428c71eb3ce658427812f038b943;hpb=121c5c7346cfe29ff03606caa105f8cfa1809308;p=mkws-moved-to-github.git diff --git a/test/Makefile b/test/Makefile index 3093d77..36351a6 100644 --- 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 @@ -58,7 +58,7 @@ _phantomjs: phantomjs-all p-all: ${MAKE} phantomjs PHANTOMJS_PATH=jasmine.html - #${MAKE} phantomjs PHANTOMJS_PATH=jasmine-cors-popup.html + ${MAKE} phantomjs PHANTOMJS_PATH=jasmine-cors-popup.html ${MAKE} phantomjs PHANTOMJS_PATH=jasmine-local-popup.html ${MAKE} phantomjs PHANTOMJS_PATH=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: