X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=test%2FMakefile;h=7ac50624b606cb443326c90af301fc5ca64ca481;hb=65d410c83fe9a7dc5279944fa5ebdb4452d3f5d1;hp=79c7569a0aa601506f13512133f5e38a9d52dc4e;hpb=99212c563c4037889c6c4ab4e6255f69e94744cc;p=mkws-moved-to-github.git diff --git a/test/Makefile b/test/Makefile index 79c7569..7ac5062 100644 --- 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=16 +PHANTOMJS_TIMEOUT=18 NPM_INSTALL_FLAGS=-q JASMINE_NODE= ./node_modules/jasmine-node/bin/jasmine-node @@ -28,6 +28,7 @@ clean: distclean: clean clean-tmp clean-error rm -rf node_modules rm -f ${TMP_DIR}/jasmine-dev + rm -f libexec clean-error: rm -f mkws-error.png.* mkws-error.html.* @@ -107,8 +108,9 @@ help: @echo " [ apache-stop apache-start ]" @echo "" @echo "Examples" - @echo " make phantomjs PHANTOMJS_PATH=${PHANTOMJS_PATH}" - @echo "DEBUG=0 APACHE_PORT=5050 make phantomjs PHANTOMJS_TIMEOUT=12 PHANTOMJS_PATH=${PHANTOMJS_PATH}" - @echo "DEBUG=2 make phantomjs PHANTOMJS_TIMEOUT=12 PHANTOMJS_URL=${PHANTOMJS_URL}" + @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=2 make phantomjs PHANTOMJS_TIMEOUT=12 PHANTOMJS_URL=${PHANTOMJS_URL}" @echo ""