X-Git-Url: http://sru.miketaylor.org.uk/?a=blobdiff_plain;f=test%2FMakefile;h=69e446ccf115b921ed89dc70991979a554b0f371;hb=68b956a49e8ca13bde2934af62f014f7c9138594;hp=5705e4d02663fa7980ddaa23df6c1eb4146907b3;hpb=2ad37a64bff1892127a781d6bf8f9c2009f8b32c;p=mkws-moved-to-github.git diff --git a/test/Makefile b/test/Makefile index 5705e4d..69e446c 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=18 +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