projects
/
mkws-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
New file, images.html displays thumbnail images inline.
[mkws-moved-to-github.git]
/
test
/
Makefile
diff --git
a/test/Makefile
b/test/Makefile
index
a6c0865
..
4cc9211
100644
(file)
--- a/
test/Makefile
+++ b/
test/Makefile
@@
-1,11
+1,14
@@
-# 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
# For running on Mike's local install of node.js
MIKE = PATH=$$PATH:/usr/local/lib/node-v0.10.24-linux-x64/bin
+
+PHANTOMJS_URL=https://mkws-dev.indexdata.com/jasmine-popup.html
+PHANTOMJS_TIMEOUT=12
+
NPM_INSTALL_FLAGS=-q
NPM_INSTALL_FLAGS=-q
-PHANTOMJS= ./node_modules/phantomjs/bin/phantomjs
-PHANTOMJS_URL= https://mkws-dev.indexdata.com/jasmine-popup.html
-PHANTOMJS_TIMEOUT= 12
+JASMINE_NODE= ./node_modules/jasmine-node/bin/jasmine-node
+PHANTOMJS= ./bomb.pl ./node_modules/phantomjs/bin/phantomjs
IMAGES= ./images
SCREENSHOT_WIDTH= 360 480 640 768 1024 1200 1440 2048
IMAGES= ./images
SCREENSHOT_WIDTH= 360 480 640 768 1024 1200 1440 2048
@@
-22,8
+25,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
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
test: check
@@
-53,8
+55,7
@@
jsbeautifier jsb indent:
jsbeautifier -j $$i > $@.tmp && mv -f $@.tmp $$i; \
done
jsbeautifier -j $$i > $@.tmp && mv -f $@.tmp $$i; \
done
-node-modules: node_modules
-node_modules:
+node_modules node-modules:
npm install ${NPM_INSTALL_FLAGS}
help:
npm install ${NPM_INSTALL_FLAGS}
help: