X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=test%2FMakefile;h=ee50534304f92d8fc5f78e8cce87cb6c9cf1cb23;hb=17f6e251e4cceb61561611ebbf3c2f34ac3142d7;hp=71cd04e5eeb424608c52ca3da81201b3c3370910;hpb=329840de4815ae08900c31f9e5ff1e3a85c6e6a9;p=mkws-moved-to-github.git diff --git a/test/Makefile b/test/Makefile index 71cd04e..ee50534 100644 --- a/test/Makefile +++ b/test/Makefile @@ -1,10 +1,11 @@ -# Copyright (c) 2013 IndexData ApS. http://indexdata.com +# Copyright (c) 2013-2014 IndexData 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 + NPM_INSTALL_FLAGS=-q JASMINE_NODE= ./node_modules/jasmine-node/bin/jasmine-node -PHANTOMJS= ./node_modules/phantomjs/bin/phantomjs +PHANTOMJS= ./bomb.pl ./node_modules/phantomjs/bin/phantomjs PHANTOMJS_URL= https://mkws-dev.indexdata.com/jasmine-popup.html PHANTOMJS_TIMEOUT= 12 IMAGES= ./images @@ -24,7 +25,6 @@ mkws-complete-syntax-check: check: mkws-complete-syntax-check @if [ ! -e node_modules ]; then echo "please run first: make node-modules"; exit 1; fi ${JASMINE_NODE} --noColor --captureExceptions --forceexit ./spec - ${JASMINE_NODE} --noColor --captureExceptions --forceexit ./spec-sp test: check