since we have ./logs/.gitignore, we don't need a ./logs/.gitkeep file anymore

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

diff --git a/test/Makefile b/test/Makefile
index 044a048..7cd3e14 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,8 +12,9 @@ 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
 
@@ -22,11 +23,12 @@ clean:
 
 distclean: clean clean-tmp
        rm -rf node_modules
+       rm -f ${TMP_DIR}/jasmine-dev
 
 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
@@ -41,7 +43,7 @@ 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}
+       ./bin/bomb.pl --timeout="${PHANTOMJS_TIMEOUT}.5" ${PHANTOMJS} phantom/run-jasmine.js ${PHANTOMJS_URL} ${PHANTOMJS_TIMEOUT}
        ${MAKE} apache-stop
 
 screenshot:
@@ -74,7 +76,7 @@ node_modules node-modules:
 
 apache-start:
        bin/apache-template-update
-       /usr/sbin/apache2 -f `pwd`/../tools/apache2/jasmine-dev
+       ${APACHE_HTTPD} -f `pwd`/${TMP_DIR}/jasmine-dev
        
 apache-stop:
        @-if [ -e ${TMP_DIR}/mkws-jasmine.pid ]; then \
@@ -91,5 +93,5 @@ help:
        @echo "     [ node-modules ]"
        @echo "     [ apache-stop apache-start ]"
        @echo ""
-       @echo "DEBUG=1 make phantomjs PHANTOMJS_TIMEOUT=8 PHANTOMJS_URL=https://mkws-dev.indexdata.com/jasmine-popup.html"
+       @echo "DEBUG=1 make phantomjs PHANTOMJS_TIMEOUT=8 PHANTOMJS_URL=${PHANTOMJS_URL}"