X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=test%2FMakefile;h=d4597df4f216f59d1a5e543061f8041ec7598b34;hb=a389618ea922160f7b74274dfa521387fa6055da;hp=79c7569a0aa601506f13512133f5e38a9d52dc4e;hpb=99212c563c4037889c6c4ab4e6255f69e94744cc;p=mkws-moved-to-github.git

diff --git a/test/Makefile b/test/Makefile
index 79c7569..d4597df 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -1,4 +1,4 @@
-# Copyright (c) 2013-2014 IndexData ApS. http://indexdata.com
+# Copyright (c) 2013-2014 Index Data ApS. http://indexdata.com
 
 # For running on Mike's local install of node.js
 MIKE = PATH=$$PATH:/usr/local/lib/node-v0.10.24-linux-x64/bin
@@ -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=16
+PHANTOMJS_TIMEOUT=18
 
 NPM_INSTALL_FLAGS=-q
 JASMINE_NODE=	./node_modules/jasmine-node/bin/jasmine-node
@@ -28,6 +28,8 @@ clean:
 distclean: clean clean-tmp clean-error
 	rm -rf node_modules
 	rm -f ${TMP_DIR}/jasmine-dev
+	rm -f libexec
+	make -C./widgets $@
 
 clean-error:
 	rm -f mkws-error.png.* mkws-error.html.*
@@ -55,6 +57,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-local-popup.html
+	${MAKE} phantomjs PHANTOMJS_PATH=jasmine-popup.html
+	${MAKE} phantomjs PHANTOMJS_PATH=jasmine-cors-popup.html
+	${MAKE} phantomjs PHANTOMJS_PATH=jasmine.html
+
 mike-test:
 	$(MAKE) _phantomjs PHANTOMJS_URL=http://x.example.indexdata.com/jasmine-popup.html
 
@@ -73,6 +81,9 @@ screenshot-indexdata:
 	done; wait
 	ls -l ${IMAGES}
 
+screenshots:
+	make -C ./widgets $@
+
 jsbeautifier jsb indent:
 	for i in package.json ./spec*/*.js ./js/*.js ./phantom/*.js; do \
 	  jsbeautifier -j $$i > $@.tmp && mv -f $@.tmp $$i; \
@@ -96,19 +107,23 @@ apache-stop:
 	else \
 	   killall apache2 2> /dev/null; \
 	fi
-	@sleep 0.3
+	@sleep 0.6
 	rm -f ${TMP_DIR}/mkws-jasmine.pid
 
 help:
 	@echo "make [ all | check | clean | distclean ]"
-	@echo "     [ phantomjs | screenshot ]"
-	@echo "     [ jsbeautifier | perltidy ]"
+	@echo "     [ phantomjs | phantomjs-all ]"
+	@echo "     [ jsbeautifier | perltidy | screenshot ]"
+	@echo "     [ screenshots ]"
 	@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 ""