projects
/
mkws-moved-to-github.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
fb0d7cd
)
use a variable for jasmine-node program
author
Wolfram Schneider
<wosch@indexdata.dk>
Wed, 5 Feb 2014 13:22:21 +0000
(13:22 +0000)
committer
Wolfram Schneider
<wosch@indexdata.dk>
Wed, 5 Feb 2014 13:22:21 +0000
(13:22 +0000)
test/Makefile
patch
|
blob
|
history
diff --git
a/test/Makefile
b/test/Makefile
index
bf0f561
..
71cd04e
100644
(file)
--- 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
# 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
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
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
test: check