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 target phantomjs
[mkws-moved-to-github.git]
/
test
/
Makefile
diff --git
a/test/Makefile
b/test/Makefile
index
d4106a5
..
b9ea996
100644
(file)
--- a/
test/Makefile
+++ b/
test/Makefile
@@
-2,6
+2,8
@@
# 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
+NPM_INSTALL_FLAGS=-q
+PHANTOMJS= ./node_modules/phantomjs/bin/phantomjs
all: check
all: check
@@
-14,25
+16,27
@@
mkws-complete-syntax-check:
${MAKE} -C../tools/htdocs $@
check: mkws-complete-syntax-check
${MAKE} -C../tools/htdocs $@
check: mkws-complete-syntax-check
- for i in ./spec/*.js; do \
- echo "$$i"; \
- jasmine-node --noColor --captureExceptions --forceexit $$i; \
- done
+ jasmine-node --noColor --captureExceptions --forceexit ./spec
+ jasmine-node --noColor --captureExceptions --forceexit ./spec-sp
test: check
terse:
$(MIKE) jasmine-node --noColor --captureExceptions --forceexit spec
test: check
terse:
$(MIKE) jasmine-node --noColor --captureExceptions --forceexit spec
+phantomjs:
+ @# ${PHANTOMJS} phantom/evaluate.js https://mkws-dev.indexdata.com/jasmine-local-popup.html
+ ${PHANTOMJS} phantom/evaluate.js https://mkws-dev.indexdata.com/jasmine-popup.html
+
jsbeautifier jsb indent:
jsbeautifier jsb indent:
- for i in ./spec/*.js ./js/*.js; do \
+ for i in ./spec*/*.js ./js/*.js; do \
jsbeautifier -j $$i > $@.tmp && mv -f $@.tmp $$i; \
done
node-modules: node_modules
node_modules:
jsbeautifier -j $$i > $@.tmp && mv -f $@.tmp $$i; \
done
node-modules: node_modules
node_modules:
- npm install jQuery xmlhttprequest jsdom request jasmine-node
+ npm install ${NPM_INSTALL_FLAGS} jQuery xmlhttprequest jsdom request jasmine-node phantomjs
help:
help:
- @echo "make [ all | check | clean | distclean ]"
+ @echo "make [ all | check | phantomjs | clean | distclean ]"
@echo " [ jsbeautifier | node-modules ]"
@echo " [ jsbeautifier | node-modules ]"