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
Merge branch 'master' of ssh://git.indexdata.com:222/home/git/pub/mkws
[mkws-moved-to-github.git]
/
test
/
Makefile
diff --git
a/test/Makefile
b/test/Makefile
index
69e446c
..
1f6060c
100644
(file)
--- a/
test/Makefile
+++ b/
test/Makefile
@@
-42,13
+42,15
@@
clean-tmp:
mkws-complete-syntax-check:
${MAKE} -C../src ../tools/htdocs/mkws-complete.min.js
mkws-complete-syntax-check:
${MAKE} -C../src ../tools/htdocs/mkws-complete.min.js
-check check-js: mkws-complete-syntax-check
+check check-js: node-modules mkws-complete-syntax-check
+ ${JASMINE_NODE} --noColor --captureExceptions --forceexit ./spec
+
+check-node-installation:
@if [ ! -e node_modules ]; then \
echo "==> please run first: make node-modules"; \
echo ""; \
exit 1; \
fi
@if [ ! -e node_modules ]; then \
echo "==> please run first: make node-modules"; \
echo ""; \
exit 1; \
fi
- ${JASMINE_NODE} --noColor --captureExceptions --forceexit ./spec
test: check
test: check
@@
-103,14
+105,14
@@
node_modules node-modules:
apache-start:
bin/apache-template-update
apache-start:
bin/apache-template-update
- ${APACHE_HTTPD} -f `pwd`/${TMP_DIR}/jasmine-dev-${APACHE_PORT}.conf
+ umask 002; ${APACHE_HTTPD} -f `pwd`/${TMP_DIR}/jasmine-dev-${APACHE_PORT}.conf
APACHE_PID_FILE=${TMP_DIR}/mkws-jasmine-${APACHE_PORT}.pid
apache-stop:
@-if [ -e ${APACHE_PID_FILE} ]; then \
kill `cat ${APACHE_PID_FILE}`; \
else \
APACHE_PID_FILE=${TMP_DIR}/mkws-jasmine-${APACHE_PORT}.pid
apache-stop:
@-if [ -e ${APACHE_PID_FILE} ]; then \
kill `cat ${APACHE_PID_FILE}`; \
else \
- killall apache2 2> /dev/null; \
+ killall ${APACHE_HTTPD} 2> /dev/null; \
fi
@sleep 0.6
rm -f ${APACHE_PID_FILE}
fi
@sleep 0.6
rm -f ${APACHE_PID_FILE}