X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=test%2FMakefile;h=89c0c024604afafa2f6e779537a6c88eaada15ed;hb=6d1ed1311f829d8f61f3bfc0ad7327f129c87414;hp=07c3d5b766844aaa4454124628a664af32e7e678;hpb=b5f2f36b94ddbb32e31864f6b8d463dbb7c577b8;p=mkws-moved-to-github.git diff --git a/test/Makefile b/test/Makefile index 07c3d5b..89c0c02 100644 --- a/test/Makefile +++ b/test/Makefile @@ -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.* @@ -55,6 +56,12 @@ phantomjs p: apache-stop apache-start _phantomjs _phantomjs: perl ./bin/bomb.pl --timeout="${PHANTOMJS_TIMEOUT}.5" ${PHANTOMJS} phantom/run-jasmine.js ${PHANTOMJS_URL} ${PHANTOMJS_TIMEOUT} +phantomjs-all p-all: + ${MAKE} phantomjs PHANTOMJS_PATH=jasmine.html + ${MAKE} phantomjs PHANTOMJS_PATH=jasmine-cors-popup.html + ${MAKE} phantomjs PHANTOMJS_PATH=jasmine-local-popup.html + ${MAKE} phantomjs PHANTOMJS_PATH=jasmine-popup.html + mike-test: $(MAKE) _phantomjs PHANTOMJS_URL=http://x.example.indexdata.com/jasmine-popup.html @@ -101,14 +108,17 @@ apache-stop: help: @echo "make [ all | check | clean | distclean ]" - @echo " [ phantomjs | screenshot ]" - @echo " [ jsbeautifier | perltidy ]" + @echo " [ phantomjs | phantomjs-all ]" + @echo " [ jsbeautifier | perltidy | screenshot ]" @echo " [ node-modules ]" @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 "Examples: " + @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 "" + @echo "make phantomjs-all" @echo ""