From e07dba7446c2b0b281d671803d0dd1c869bac9c0 Mon Sep 17 00:00:00 2001 From: Wolfram Schneider Date: Tue, 15 Apr 2014 10:46:48 +0000 Subject: [PATCH] de-couple phantomjs regression test from debian apache setup This make it easier to run the regressiont test on a mac if you already have a mkws apache setup running. --- test/Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/test/Makefile b/test/Makefile index 6f6d637..050528f 100644 --- a/test/Makefile +++ b/test/Makefile @@ -46,9 +46,10 @@ test: check terse: $(MIKE) jasmine-node --noColor --captureExceptions --forceexit spec -phantomjs p: apache-stop apache-start +phantomjs p: apache-stop apache-start _phantomjs apache-stop + +_phantomjs: ./bin/bomb.pl --timeout="${PHANTOMJS_TIMEOUT}.5" ${PHANTOMJS} phantom/run-jasmine.js ${PHANTOMJS_URL} ${PHANTOMJS_TIMEOUT} - ${MAKE} apache-stop screenshot: ${PHANTOMJS} phantom/screenshot.js ${PHANTOMJS_URL} ${IMAGES}/screenshot.png 1200 1000 -- 1.7.10.4