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
downgrade jasmine-reporters, MKWS-236
[mkws-moved-to-github.git]
/
test
/
Makefile
diff --git
a/test/Makefile
b/test/Makefile
index
9ee3b80
..
2d58b7f
100644
(file)
--- a/
test/Makefile
+++ b/
test/Makefile
@@
-3,8
+3,11
@@
# 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
+APACHE_PORT:= $(shell echo $${APACHE_PORT-4040})
+
#PHANTOMJS_URL=https://mkws-dev.indexdata.com/jasmine-popup.html
#PHANTOMJS_URL=https://mkws-dev.indexdata.com/jasmine-popup.html
-PHANTOMJS_URL=http://localhost:4040/jasmine-local-popup.html
+PHANTOMJS_PATH=jasmine-local-popup.html
+PHANTOMJS_URL=http://localhost:${APACHE_PORT}/${PHANTOMJS_PATH}
PHANTOMJS_TIMEOUT=16
NPM_INSTALL_FLAGS=-q
PHANTOMJS_TIMEOUT=16
NPM_INSTALL_FLAGS=-q
@@
-35,7
+38,7
@@
clean-tmp:
touch ${TMP_DIR}/.gitkeep
mkws-complete-syntax-check:
touch ${TMP_DIR}/.gitkeep
mkws-complete-syntax-check:
- ${MAKE} -C../src mkws-complete.min.js
+ ${MAKE} -C../tools/htdocs mkws-complete.min.js
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
@@
-50,7
+53,7
@@
phantomjs p: apache-stop apache-start _phantomjs
${MAKE} apache-stop
_phantomjs:
${MAKE} apache-stop
_phantomjs:
- ./bin/bomb.pl --timeout="${PHANTOMJS_TIMEOUT}.5" ${PHANTOMJS} phantom/run-jasmine.js ${PHANTOMJS_URL} ${PHANTOMJS_TIMEOUT}
+ perl ./bin/bomb.pl --timeout="${PHANTOMJS_TIMEOUT}.5" ${PHANTOMJS} phantom/run-jasmine.js ${PHANTOMJS_URL} ${PHANTOMJS_TIMEOUT}
mike-test:
$(MAKE) _phantomjs PHANTOMJS_URL=http://x.example.indexdata.com/jasmine-popup.html
mike-test:
$(MAKE) _phantomjs PHANTOMJS_URL=http://x.example.indexdata.com/jasmine-popup.html