X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=test%2FMakefile;h=ee50534304f92d8fc5f78e8cce87cb6c9cf1cb23;hb=0d553ffd9b2a8ad63cbd6683230c44047d972810;hp=b44cf64a9a675754b4ab87cec52d726e3552b50c;hpb=7642e909a5b6666f529f452a435c3a3b5e5a562a;p=mkws-moved-to-github.git diff --git a/test/Makefile b/test/Makefile index b44cf64..ee50534 100644 --- a/test/Makefile +++ b/test/Makefile @@ -1,8 +1,10 @@ -# 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= ./bomb.pl ./node_modules/phantomjs/bin/phantomjs PHANTOMJS_URL= https://mkws-dev.indexdata.com/jasmine-popup.html PHANTOMJS_TIMEOUT= 12 @@ -22,8 +24,7 @@ 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 + ${JASMINE_NODE} --noColor --captureExceptions --forceexit ./spec test: check