X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=test%2FMakefile;h=57b5c4692dcdea18f995528f51f95c58c19048da;hb=a6302cae8f48c3448a63b6cbd0d1ccab12232e2d;hp=2bb32dd93f18db429bd0a33bb536763daf18269a;hpb=48a4e4a82714887fbcb8121b24cf96adb2b93e97;p=mkws-moved-to-github.git diff --git a/test/Makefile b/test/Makefile index 2bb32dd..57b5c46 100644 --- 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,11 @@ 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 @@ -102,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}"