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
add timeout argument, part of MKWS-276
[mkws-moved-to-github.git]
/
test
/
Makefile
diff --git
a/test/Makefile
b/test/Makefile
index
4fbc15d
..
65fbc3e
100644
(file)
--- a/
test/Makefile
+++ b/
test/Makefile
@@
-1,4
+1,4
@@
-# Copyright (c) 2013-2014 IndexData ApS. http://indexdata.com
+# Copyright (c) 2013-2014 Index Data 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
@@
-57,10
+57,10
@@
_phantomjs:
perl ./bin/bomb.pl --timeout="${PHANTOMJS_TIMEOUT}.5" ${PHANTOMJS} phantom/run-jasmine.js ${PHANTOMJS_URL} ${PHANTOMJS_TIMEOUT}
phantomjs-all p-all:
perl ./bin/bomb.pl --timeout="${PHANTOMJS_TIMEOUT}.5" ${PHANTOMJS} phantom/run-jasmine.js ${PHANTOMJS_URL} ${PHANTOMJS_TIMEOUT}
phantomjs-all p-all:
- ${MAKE} phantomjs PHANTOMJS_PATH=jasmine.html
- ${MAKE} phantomjs PHANTOMJS_PATH=jasmine-cors-popup.html
${MAKE} phantomjs PHANTOMJS_PATH=jasmine-local-popup.html
${MAKE} phantomjs PHANTOMJS_PATH=jasmine-popup.html
${MAKE} phantomjs PHANTOMJS_PATH=jasmine-local-popup.html
${MAKE} phantomjs PHANTOMJS_PATH=jasmine-popup.html
+ ${MAKE} phantomjs PHANTOMJS_PATH=jasmine-cors-popup.html
+ ${MAKE} phantomjs PHANTOMJS_PATH=jasmine.html
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