From fa8e83866c4c5d016cf3d1ba838773aaaa80e1ec Mon Sep 17 00:00:00 2001 From: Florian Pritz Date: Thu, 21 May 2015 15:42:09 +0200 Subject: test: run-tests.sh be less verbose Test can now also be run with multiple jobs (-jX) and php -S will no longer interfere with the output. Signed-off-by: Florian Pritz --- run-tests.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'run-tests.sh') diff --git a/run-tests.sh b/run-tests.sh index 78e36d3c9..db8d1511b 100755 --- a/run-tests.sh +++ b/run-tests.sh @@ -1,6 +1,6 @@ #!/bin/bash # -# This runs the testsuite +# This runs the testsuite. Arguments are passed to prove. # export ENVIRONMENT="testsuite" @@ -33,7 +33,7 @@ cleanup() { php index.php tools drop_all_tables } -php -S "$ip:$port" & +php -S "$ip:$port" 2>/dev/null 1>&2 & while ! curl -s "$url" >/dev/null; do sleep 0.1; @@ -42,5 +42,5 @@ done # run tests php index.php tools drop_all_tables php index.php tools update_database -prove --ext .php --state=hot,slow,all,save --timer -ve "php index.php tools test $url" -r application/test/tests/ +prove --ext .php --state=hot,slow,all,save --timer -o -e "php index.php tools test $url" -r "$@" application/test/tests/ -- cgit v1.2.3-24-g4f1b