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
The company name is: Index Data
[mkws-moved-to-github.git]
/
test
/
Makefile
diff --git
a/test/Makefile
b/test/Makefile
index
ce5c954
..
36351a6
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
@@
-28,6
+28,7
@@
clean:
distclean: clean clean-tmp clean-error
rm -rf node_modules
rm -f ${TMP_DIR}/jasmine-dev
distclean: clean clean-tmp clean-error
rm -rf node_modules
rm -f ${TMP_DIR}/jasmine-dev
+ rm -f libexec
clean-error:
rm -f mkws-error.png.* mkws-error.html.*
clean-error:
rm -f mkws-error.png.* mkws-error.html.*
@@
-55,6
+56,12
@@
phantomjs p: apache-stop apache-start _phantomjs
_phantomjs:
perl ./bin/bomb.pl --timeout="${PHANTOMJS_TIMEOUT}.5" ${PHANTOMJS} phantom/run-jasmine.js ${PHANTOMJS_URL} ${PHANTOMJS_TIMEOUT}
_phantomjs:
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
+
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
@@
-96,20
+103,22
@@
apache-stop:
else \
killall apache2 2> /dev/null; \
fi
else \
killall apache2 2> /dev/null; \
fi
- @sleep 0.3
+ @sleep 0.6
rm -f ${TMP_DIR}/mkws-jasmine.pid
help:
@echo "make [ all | check | clean | distclean ]"
rm -f ${TMP_DIR}/mkws-jasmine.pid
help:
@echo "make [ all | check | clean | distclean ]"
- @echo " [ phantomjs | screenshot ]"
- @echo " [ jsbeautifier | perltidy ]"
+ @echo " [ phantomjs | phantomjs-all ]"
+ @echo " [ jsbeautifier | perltidy | screenshot ]"
@echo " [ node-modules ]"
@echo " [ apache-stop apache-start ]"
@echo ""
@echo " [ node-modules ]"
@echo " [ apache-stop apache-start ]"
@echo ""
- @echo "Examples"
+ @echo "Examples: "
@echo ""
@echo "make phantomjs PHANTOMJS_PATH=${PHANTOMJS_PATH}"
@echo "DEBUG=0 APACHE_PORT=5050 make -s phantomjs PHANTOMJS_TIMEOUT=12 PHANTOMJS_PATH=${PHANTOMJS_PATH}"
@echo "DEBUG=2 make phantomjs PHANTOMJS_TIMEOUT=12 PHANTOMJS_URL=${PHANTOMJS_URL}"
@echo ""
@echo ""
@echo "make phantomjs PHANTOMJS_PATH=${PHANTOMJS_PATH}"
@echo "DEBUG=0 APACHE_PORT=5050 make -s phantomjs PHANTOMJS_TIMEOUT=12 PHANTOMJS_PATH=${PHANTOMJS_PATH}"
@echo "DEBUG=2 make phantomjs PHANTOMJS_TIMEOUT=12 PHANTOMJS_URL=${PHANTOMJS_URL}"
@echo ""
+ @echo "make phantomjs-all"
+ @echo ""