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
typo
[mkws-moved-to-github.git]
/
test
/
Makefile
diff --git
a/test/Makefile
b/test/Makefile
index
dacc8f8
..
c4cb346
100644
(file)
--- a/
test/Makefile
+++ b/
test/Makefile
@@
-5,10
+5,10
@@
MIKE = PATH=$$PATH:/usr/local/lib/node-v0.10.24-linux-x64/bin
APACHE_PORT:= $(shell echo $${APACHE_PORT-4040})
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_PATH=jasmine-local-popup.html
PHANTOMJS_URL=http://localhost:${APACHE_PORT}/${PHANTOMJS_PATH}
PHANTOMJS_PATH=jasmine-local-popup.html
PHANTOMJS_URL=http://localhost:${APACHE_PORT}/${PHANTOMJS_PATH}
-PHANTOMJS_TIMEOUT=18
+PHANTOMJS_TIMEOUT ?= 30
NPM_INSTALL_FLAGS=-q
JASMINE_NODE= ./node_modules/jasmine-node/bin/jasmine-node
NPM_INSTALL_FLAGS=-q
JASMINE_NODE= ./node_modules/jasmine-node/bin/jasmine-node
@@
-18,16
+18,17
@@
SCREENSHOT_WIDTH= 360 480 640 768 1024 1200 1440 2048
PERL_SCRIPTS= bin/bomb.pl
TMP_DIR= ./logs
APACHE_HTTPD:= $(shell env PATH=$$PATH:/usr/sbin which apache2 httpd false | head -1 )
PERL_SCRIPTS= bin/bomb.pl
TMP_DIR= ./logs
APACHE_HTTPD:= $(shell env PATH=$$PATH:/usr/sbin which apache2 httpd false | head -1 )
+APACHE_PORT ?= 4040
all: check
clean:
all: check
clean:
- rm -f mkws-error.png mkws-error.html
+ rm -f mkws-error.png mkws-error.html
rm -f images/*.png
rm -f images/*.png
+ ${MAKE} -C./widgets $@
-distclean: clean clean-tmp clean-error
+distclean: apache-stop clean clean-tmp clean-error
rm -rf node_modules
rm -rf node_modules
- rm -f ${TMP_DIR}/jasmine-dev
rm -f libexec
clean-error:
rm -f libexec
clean-error:
@@
-39,18
+40,24
@@
clean-tmp:
touch ${TMP_DIR}/.gitkeep
mkws-complete-syntax-check:
touch ${TMP_DIR}/.gitkeep
mkws-complete-syntax-check:
- ${MAKE} -C../tools/htdocs mkws-complete.min.js
+ ${MAKE} -C../src ../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 check-js: node-modules mkws-complete-syntax-check
${JASMINE_NODE} --noColor --captureExceptions --forceexit ./spec
${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
+
test: check
terse:
$(MIKE) jasmine-node --noColor --captureExceptions --forceexit spec
test: check
terse:
$(MIKE) jasmine-node --noColor --captureExceptions --forceexit spec
-phantomjs p: apache-stop apache-start _phantomjs
+phantomjs p: check-js apache-stop apache-start _phantomjs
${MAKE} apache-stop
_phantomjs:
${MAKE} apache-stop
_phantomjs:
@@
-81,7
+88,7
@@
screenshot-indexdata:
ls -l ${IMAGES}
screenshots:
ls -l ${IMAGES}
screenshots:
- make -C ./widgets $@
+ ${MAKE} -C ./widgets $@
jsbeautifier jsb indent:
for i in package.json ./spec*/*.js ./js/*.js ./phantom/*.js; do \
jsbeautifier jsb indent:
for i in package.json ./spec*/*.js ./js/*.js ./phantom/*.js; do \
@@
-98,16
+105,17
@@
node_modules node-modules:
apache-start:
bin/apache-template-update
apache-start:
bin/apache-template-update
- ${APACHE_HTTPD} -f `pwd`/${TMP_DIR}/jasmine-dev
+ 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:
apache-stop:
- @-if [ -e ${TMP_DIR}/mkws-jasmine.pid ]; then \
- kill `cat ${TMP_DIR}/mkws-jasmine.pid`; \
+ @-if [ -e ${APACHE_PID_FILE} ]; then \
+ kill `cat ${APACHE_PID_FILE}`; \
else \
else \
- killall apache2 2> /dev/null; \
+ killall ${APACHE_HTTPD} 2> /dev/null; \
fi
@sleep 0.6
fi
@sleep 0.6
- rm -f ${TMP_DIR}/mkws-jasmine.pid
+ rm -f ${APACHE_PID_FILE}
help:
@echo "make [ all | check | clean | distclean ]"
help:
@echo "make [ all | check | clean | distclean ]"
@@
-120,9
+128,9
@@
help:
@echo "Examples: "
@echo ""
@echo "make phantomjs PHANTOMJS_PATH=${PHANTOMJS_PATH}"
@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=0 APACHE_PORT=5050 make -s phantomjs PHANTOMJS_TIMEOUT=16 PHANTOMJS_PATH=${PHANTOMJS_PATH}"
@echo "DEBUG=2 make phantomjs PHANTOMJS_TIMEOUT=12 PHANTOMJS_URL=${PHANTOMJS_URL}"
@echo ""
@echo "DEBUG=2 make phantomjs PHANTOMJS_TIMEOUT=12 PHANTOMJS_URL=${PHANTOMJS_URL}"
@echo ""
+ @echo "make APACHE_PORT=5050 apache-start"
@echo "make phantomjs-all"
@echo ""
@echo "make phantomjs-all"
@echo ""
-