X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=test%2FMakefile;h=71cd04e5eeb424608c52ca3da81201b3c3370910;hb=4f1ab9ef2368bc67a0964b349de30fd1d425bb5c;hp=bf0f56138dbc685fb0692dce956814d3adc11553;hpb=fb0d7cd773d04efdbb6a96d6a0fa13d01cee732f;p=mkws-moved-to-github.git diff --git a/test/Makefile b/test/Makefile index bf0f561..71cd04e 100644 --- a/test/Makefile +++ b/test/Makefile @@ -3,6 +3,7 @@ # 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_URL= https://mkws-dev.indexdata.com/jasmine-popup.html PHANTOMJS_TIMEOUT= 12 @@ -22,8 +23,8 @@ 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 + ${JASMINE_NODE} --noColor --captureExceptions --forceexit ./spec-sp test: check