Improve detection of failures, part of MKWS-282

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

diff --git a/test/Makefile b/test/Makefile
index 3093d77..36351a6 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
@@ -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: