Merge branch 'master' of ssh://git.indexdata.com/home/git/private/mkws

diff --git a/Makefile b/Makefile
index e37daa0..9504c36 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -13,7 +13,7 @@ clean distclean:
 check-js:
        ${MAKE} -C./test check
 
-phantomjs:
+phantomjs p:
        ${MAKE} -C./test $@
 
 # must be called once after GIT checkout
@@ -22,6 +22,8 @@ setup:
        ${MAKE} -C./test node-modules
 
 check: setup check-js
+       @echo ""
+       @echo "To run jasmine regression tests, type: make phantomjs"
 
 help:
        @echo "make [ all | setup | clean | distclean ]"

diff --git a/test/Makefile b/test/Makefile
index 3c420ea..125efa7 100644 (file)
--- a/test/Makefile
+++ b/test/Makefile
@@ -46,7 +46,8 @@ 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}
@@ -93,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 ]"