Add two more lines.

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

diff --git a/test/Makefile b/test/Makefile
index a7c1ea0..2d3e8bb 100644 (file)
--- a/test/Makefile
+++ b/test/Makefile
@@ -8,7 +8,7 @@ APACHE_PORT:= $(shell echo $${APACHE_PORT-4040})
 #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_TIMEOUT=30
+PHANTOMJS_TIMEOUT ?= 30
 
 NPM_INSTALL_FLAGS=-q
 JASMINE_NODE=  ./node_modules/jasmine-node/bin/jasmine-node
@@ -27,7 +27,7 @@ clean:
        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 -f libexec
 
@@ -42,13 +42,15 @@ clean-tmp:
 mkws-complete-syntax-check:
        ${MAKE} -C../src ../tools/htdocs/mkws-complete.min.js
 
-check check-js: mkws-complete-syntax-check
+check check-js: node-modules mkws-complete-syntax-check
+       ${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
-       ${JASMINE_NODE} --noColor --captureExceptions --forceexit ./spec
 
 test: check
 
@@ -59,13 +61,13 @@ phantomjs p: check-js apache-stop apache-start _phantomjs
        ${MAKE} apache-stop
 
 _phantomjs:
-       perl ./bin/bomb.pl --timeout="${PHANTOMJS_TIMEOUT}.5" ${PHANTOMJS} phantom/run-jasmine.js ${PHANTOMJS_URL} ${PHANTOMJS_TIMEOUT}
+       ./bin/bomb --timeout="${PHANTOMJS_TIMEOUT}.5" ${PHANTOMJS} phantom/run-jasmine.js ${PHANTOMJS_URL} ${PHANTOMJS_TIMEOUT}
 
 phantomjs-all p-all:
        ${MAKE} phantomjs PHANTOMJS_PATH=jasmine-local-popup.html
-       ${MAKE} phantomjs PHANTOMJS_PATH=jasmine-popup.html
-       ${MAKE} phantomjs PHANTOMJS_PATH=jasmine-cors-popup.html
-       ${MAKE} phantomjs PHANTOMJS_PATH=jasmine.html
+       ${MAKE} phantomjs PHANTOMJS_PATH=jasmine-popup.html?lang=de
+       ${MAKE} phantomjs PHANTOMJS_PATH=jasmine-cms-popup.html?lang=en
+       ${MAKE} phantomjs PHANTOMJS_PATH=jasmine.html?lang=da
 
 mike-test:
        $(MAKE) _phantomjs PHANTOMJS_URL=http://x.example.indexdata.com/jasmine-popup.html
@@ -85,7 +87,7 @@ screenshot-indexdata:
        done; wait
        ls -l ${IMAGES}
 
-screenshots:
+screenshots: check
        ${MAKE} -C ./widgets $@
 
 jsbeautifier jsb indent:
@@ -103,14 +105,14 @@ node_modules node-modules:
 
 apache-start:
        bin/apache-template-update
-       ${APACHE_HTTPD} -f `pwd`/${TMP_DIR}/jasmine-dev-${APACHE_PORT}.conf
+       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:
        @-if [ -e ${APACHE_PID_FILE} ]; then \
           kill `cat ${APACHE_PID_FILE}`; \
        else \
-          killall apache2 2> /dev/null; \
+          killall ${APACHE_HTTPD} 2> /dev/null; \
        fi
        @sleep 0.6
        rm -f ${APACHE_PID_FILE}
@@ -126,7 +128,7 @@ help:
        @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 "make APACHE_PORT=5050 apache-start"