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
detect correct apache binary
[mkws-moved-to-github.git]
/
test
/
Makefile
diff --git
a/test/Makefile
b/test/Makefile
index
6f6d637
..
45c3422
100644
(file)
--- a/
test/Makefile
+++ b/
test/Makefile
@@
-14,7
+14,7
@@
IMAGES= ./images
SCREENSHOT_WIDTH= 360 480 640 768 1024 1200 1440 2048
PERL_SCRIPTS= bin/bomb.pl
TMP_DIR= ./logs
SCREENSHOT_WIDTH= 360 480 640 768 1024 1200 1440 2048
PERL_SCRIPTS= bin/bomb.pl
TMP_DIR= ./logs
-APACHE_HTTPD= /usr/sbin/apache2
+APACHE_HTTPD:= $(shell env PATH=$$PATH:/usr/sbin which apache2 httpd)
all: check
all: check
@@
-32,7
+32,7
@@
clean-error:
clean-tmp:
rm -rf ${TMP_DIR}
mkdir -p ${TMP_DIR}
clean-tmp:
rm -rf ${TMP_DIR}
mkdir -p ${TMP_DIR}
- touch ${TMP_DIR}/.gitignore
+ touch ${TMP_DIR}/.gitkeep
mkws-complete-syntax-check:
${MAKE} -C../src mkws-complete.min.js
mkws-complete-syntax-check:
${MAKE} -C../src mkws-complete.min.js
@@
-46,10
+46,15
@@
test: check
terse:
$(MIKE) jasmine-node --noColor --captureExceptions --forceexit spec
terse:
$(MIKE) jasmine-node --noColor --captureExceptions --forceexit spec
-phantomjs p: apache-stop apache-start
- ./bin/bomb.pl --timeout="${PHANTOMJS_TIMEOUT}.5" ${PHANTOMJS} phantom/run-jasmine.js ${PHANTOMJS_URL} ${PHANTOMJS_TIMEOUT}
+phantomjs p: apache-stop apache-start _phantomjs
${MAKE} apache-stop
${MAKE} apache-stop
+_phantomjs:
+ ./bin/bomb.pl --timeout="${PHANTOMJS_TIMEOUT}.5" ${PHANTOMJS} phantom/run-jasmine.js ${PHANTOMJS_URL} ${PHANTOMJS_TIMEOUT}
+
+mike-test:
+ $(MAKE) _phantomjs PHANTOMJS_URL=http://x.example.indexdata.com/jasmine-popup.html
+
screenshot:
${PHANTOMJS} phantom/screenshot.js ${PHANTOMJS_URL} ${IMAGES}/screenshot.png 1200 1000
screenshot:
${PHANTOMJS} phantom/screenshot.js ${PHANTOMJS_URL} ${IMAGES}/screenshot.png 1200 1000
@@
-81,7
+86,7
@@
node_modules node-modules:
apache-start:
bin/apache-template-update
${APACHE_HTTPD} -f `pwd`/${TMP_DIR}/jasmine-dev
apache-start:
bin/apache-template-update
${APACHE_HTTPD} -f `pwd`/${TMP_DIR}/jasmine-dev
-
+
apache-stop:
@-if [ -e ${TMP_DIR}/mkws-jasmine.pid ]; then \
kill `cat ${TMP_DIR}/mkws-jasmine.pid`; \
apache-stop:
@-if [ -e ${TMP_DIR}/mkws-jasmine.pid ]; then \
kill `cat ${TMP_DIR}/mkws-jasmine.pid`; \
@@
-89,6
+94,7
@@
apache-stop:
killall apache2 2> /dev/null; \
fi
@sleep 0.3
killall apache2 2> /dev/null; \
fi
@sleep 0.3
+ rm -f ${TMP_DIR}/mkws-jasmine.pid
help:
@echo "make [ all | check | clean | distclean ]"
help:
@echo "make [ all | check | clean | distclean ]"