X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;ds=sidebyside;f=test%2FMakefile;h=8547d4ea3956f0d4efe504d7cdc82988f48b4506;hb=87b2c72772dfc8cfcb820e52f40e0694e4bb2dd3;hp=2bb32dd93f18db429bd0a33bb536763daf18269a;hpb=48a4e4a82714887fbcb8121b24cf96adb2b93e97;p=mkws-moved-to-github.git diff --git a/test/Makefile b/test/Makefile index 2bb32dd..8547d4e 100644 --- a/test/Makefile +++ b/test/Makefile @@ -32,7 +32,7 @@ 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 @@ -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}