X-Git-Url: http://git.indexdata.com/?p=mkws-moved-to-github.git;a=blobdiff_plain;f=test%2FMakefile;h=2d3e8bbfe4f9f68b27403b5a5a5f6355efaf2ac1;hp=c4cb34679274f7ff4ad9bb196ca05be2fdfa91af;hb=e39fc641e7845d8b114f465b73aa7a5e7fa7d412;hpb=0b8db87910e02328db600f653e8a4421a94bc3aa diff --git a/test/Makefile b/test/Makefile index c4cb346..2d3e8bb 100644 --- a/test/Makefile +++ b/test/Makefile @@ -61,13 +61,13 @@ phantomjs p: check-js apache-stop apache-start _phantomjs ${MAKE} apache-stop _phantomjs: - perl ./bin/bomb.pl --timeout="${PHANTOMJS_TIMEOUT}.5" ${PHANTOMJS} phantom/run-jasmine.js ${PHANTOMJS_URL} ${PHANTOMJS_TIMEOUT} + ./bin/bomb --timeout="${PHANTOMJS_TIMEOUT}.5" ${PHANTOMJS} phantom/run-jasmine.js ${PHANTOMJS_URL} ${PHANTOMJS_TIMEOUT} phantomjs-all p-all: ${MAKE} phantomjs PHANTOMJS_PATH=jasmine-local-popup.html - ${MAKE} phantomjs PHANTOMJS_PATH=jasmine-popup.html - ${MAKE} phantomjs PHANTOMJS_PATH=jasmine-cors-popup.html - ${MAKE} phantomjs PHANTOMJS_PATH=jasmine.html + ${MAKE} phantomjs PHANTOMJS_PATH=jasmine-popup.html?lang=de + ${MAKE} phantomjs PHANTOMJS_PATH=jasmine-cms-popup.html?lang=en + ${MAKE} phantomjs PHANTOMJS_PATH=jasmine.html?lang=da mike-test: $(MAKE) _phantomjs PHANTOMJS_URL=http://x.example.indexdata.com/jasmine-popup.html @@ -87,7 +87,7 @@ screenshot-indexdata: done; wait ls -l ${IMAGES} -screenshots: +screenshots: check ${MAKE} -C ./widgets $@ jsbeautifier jsb indent: