diff options
| author | Florian Pritz <bluewind@xinu.at> | 2015-05-21 15:42:09 +0200 |
|---|---|---|
| committer | Florian Pritz <bluewind@xinu.at> | 2015-05-21 18:43:13 +0200 |
| commit | fa8e83866c4c5d016cf3d1ba838773aaaa80e1ec (patch) | |
| tree | adb477898327c2264e7d63e0d6da0a5b54f8acaa | |
| parent | b18fde3b52a40b8d1acc6d7d82efdf764590edbf (diff) | |
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 <bluewind@xinu.at>
| -rwxr-xr-x | run-tests.sh | 6 |
1 files changed, 3 insertions, 3 deletions
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/ |