X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=test%2FMakefile;h=65fbc3e5ead40ce6d09783cb54ca8429fb8a840b;hb=09bc6df503cbcb0a222a2888294a2294d897d1bb;hp=4fbc15d9c860615e5a699c2bb18cdd409bb4604a;hpb=261f4f818ac4ed248902bb9b99172c41766620cd;p=mkws-moved-to-github.git diff --git a/test/Makefile b/test/Makefile index 4fbc15d..65fbc3e 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 @@ -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