de-couple phantomjs regression test from debian apache setup

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

diff --git a/test/Makefile b/test/Makefile
index a1142b1..050528f 100644 (file)
--- a/test/Makefile
+++ b/test/Makefile
@@ -4,7 +4,7 @@
 MIKE = PATH=$$PATH:/usr/local/lib/node-v0.10.24-linux-x64/bin
 
 #PHANTOMJS_URL=https://mkws-dev.indexdata.com/jasmine-popup.html       
-PHANTOMJS_URL=http://localhost:4040/jasmine-popup.html
+PHANTOMJS_URL=http://localhost:4040/jasmine-local-popup.html
 PHANTOMJS_TIMEOUT=16
 
 NPM_INSTALL_FLAGS=-q
@@ -12,23 +12,27 @@ JASMINE_NODE=       ./node_modules/jasmine-node/bin/jasmine-node
 PHANTOMJS=     ./node_modules/phantomjs/bin/phantomjs
 IMAGES=        ./images
 SCREENSHOT_WIDTH=      360 480 640 768 1024 1200 1440 2048
-PERL_SCRIPTS=  bomb.pl
+PERL_SCRIPTS=  bin/bomb.pl
 TMP_DIR=       ./logs
 APACHE_HTTPD=  /usr/sbin/apache2
 
 all: check
 
 clean:
-       rm -f mkws-error.png mkws-error.html images/*.png
+       rm -f mkws-error.png mkws-error.html 
+       rm -f images/*.png
 
-distclean: clean clean-tmp
+distclean: clean clean-tmp clean-error
        rm -rf node_modules
        rm -f ${TMP_DIR}/jasmine-dev
 
+clean-error:
+       rm -f mkws-error.png.* mkws-error.html.*
+
 clean-tmp:
        rm -rf ${TMP_DIR}
        mkdir -p ${TMP_DIR}
-       touch ${TMP_DIR}/.gitkeep
+       touch ${TMP_DIR}/.gitignore
 
 mkws-complete-syntax-check:
        ${MAKE} -C../src mkws-complete.min.js
@@ -42,9 +46,10 @@ test: check
 terse:
        $(MIKE) jasmine-node --noColor --captureExceptions --forceexit spec
 
-phantomjs p: apache-stop apache-start
-       ./bomb.pl --timeout="${PHANTOMJS_TIMEOUT}.5" ${PHANTOMJS} phantom/run-jasmine.js ${PHANTOMJS_URL} ${PHANTOMJS_TIMEOUT}
-       ${MAKE} apache-stop
+phantomjs p: apache-stop apache-start _phantomjs apache-stop
+
+_phantomjs:
+       ./bin/bomb.pl --timeout="${PHANTOMJS_TIMEOUT}.5" ${PHANTOMJS} phantom/run-jasmine.js ${PHANTOMJS_URL} ${PHANTOMJS_TIMEOUT}
 
 screenshot:
        ${PHANTOMJS} phantom/screenshot.js ${PHANTOMJS_URL} ${IMAGES}/screenshot.png 1200 1000