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 mkws-examples-mike, initially a copy of the old file that had
[mkws-moved-to-github.git]
/
test
/
Makefile
diff --git
a/test/Makefile
b/test/Makefile
index
3093d77
..
4fbc15d
100644
(file)
--- a/
test/Makefile
+++ b/
test/Makefile
@@
-58,7
+58,7
@@
_phantomjs:
phantomjs-all p-all:
${MAKE} phantomjs PHANTOMJS_PATH=jasmine.html
phantomjs-all p-all:
${MAKE} phantomjs PHANTOMJS_PATH=jasmine.html
- #${MAKE} phantomjs PHANTOMJS_PATH=jasmine-cors-popup.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
@@
-103,7
+103,7
@@
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:
rm -f ${TMP_DIR}/mkws-jasmine.pid
help: