Merge remote branch 'origin/MKWS-229'

[mkws-moved-to-github.git] / test / Makefile

diff --git a/test/Makefile b/test/Makefile
index 050528f..57b5c46 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
-APACHE_HTTPD=  /usr/sbin/apache2
+APACHE_HTTPD:= $(shell env PATH=$$PATH:/usr/sbin which apache2 httpd false | head -1 )
 
 all: check
 
@@ -32,10 +32,10 @@ clean-error:
 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
+       ${MAKE} -C../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 
@@ -46,10 +46,14 @@ test: check
 terse:
        $(MIKE) jasmine-node --noColor --captureExceptions --forceexit spec
 
-phantomjs p: apache-stop apache-start _phantomjs apache-stop
+phantomjs p: apache-stop apache-start _phantomjs 
+       ${MAKE} apache-stop
 
 _phantomjs:
-       ./bin/bomb.pl --timeout="${PHANTOMJS_TIMEOUT}.5" ${PHANTOMJS} phantom/run-jasmine.js ${PHANTOMJS_URL} ${PHANTOMJS_TIMEOUT}
+       perl ./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
@@ -82,7 +86,7 @@ node_modules node-modules:
 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`; \
@@ -90,6 +94,7 @@ apache-stop:
           killall apache2 2> /dev/null; \
        fi
        @sleep 0.3
+       rm -f ${TMP_DIR}/mkws-jasmine.pid
 
 help:
        @echo "make [ all | check | clean | distclean ]"
@@ -98,5 +103,5 @@ help:
        @echo "     [ node-modules ]"
        @echo "     [ apache-stop apache-start ]"
        @echo ""
-       @echo "DEBUG=1 make phantomjs PHANTOMJS_TIMEOUT=8 PHANTOMJS_URL=${PHANTOMJS_URL}"
+       @echo "DEBUG=1 make phantomjs PHANTOMJS_TIMEOUT=12 PHANTOMJS_URL=${PHANTOMJS_URL}"