From: Wolfram Schneider Date: Wed, 5 Feb 2014 13:22:43 +0000 (+0000) Subject: Merge branch 'master' of ssh://git.indexdata.com:222/home/git/private/mkws X-Git-Tag: 1.0.0~1515^2~14 X-Git-Url: http://git.indexdata.com/?a=commitdiff_plain;h=83ee2bcf59fdd0c3c6dcc502e372a00a2a53dd3d;hp=c18d9dedf4b4a6b01507076cac7014c9051d3fc7;p=mkws-moved-to-github.git Merge branch 'master' of ssh://git.indexdata.com:222/home/git/private/mkws --- 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