X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=test%2FMakefile;h=c0333fa988f3a267c33861d2812341e4a68d7381;hb=1b1930f16512cb3718ad3fd84c1eb5e42d9f1488;hp=1114eef91a334d4eb6a8d0f587acbfa94abeda66;hpb=0672f678f2ce2022e73d84b77b948f4c25a1ec6b;p=mkws-moved-to-github.git diff --git a/test/Makefile b/test/Makefile index 1114eef..c0333fa 100644 --- a/test/Makefile +++ b/test/Makefile @@ -25,7 +25,7 @@ all: check clean: rm -f mkws-error.png mkws-error.html rm -f images/*.png - make -C./widgets $@ + ${MAKE} -C./widgets $@ distclean: clean clean-tmp clean-error rm -rf node_modules @@ -40,9 +40,9 @@ clean-tmp: touch ${TMP_DIR}/.gitkeep mkws-complete-syntax-check: - ${MAKE} -C../tools/htdocs mkws-complete.min.js + ${MAKE} -C../src ../tools/htdocs/mkws-complete.min.js -check: mkws-complete-syntax-check +check check-js: mkws-complete-syntax-check @if [ ! -e node_modules ]; then echo "please run first: make node-modules"; exit 1; fi ${JASMINE_NODE} --noColor --captureExceptions --forceexit ./spec @@ -82,7 +82,7 @@ screenshot-indexdata: ls -l ${IMAGES} screenshots: - make -C ./widgets $@ + ${MAKE} -C ./widgets $@ jsbeautifier jsb indent: for i in package.json ./spec*/*.js ./js/*.js ./phantom/*.js; do \ @@ -125,6 +125,7 @@ help: @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 "" + @echo "make APACHE_PORT=5050 apache-start" @echo "make phantomjs-all" @echo ""