From eb00062b4e7aba506988433320827a435bfb9176 Mon Sep 17 00:00:00 2001 From: Florian Pritz Date: Mon, 1 Jan 2018 19:43:22 +0100 Subject: Use temporary directory for testsuite uploads Signed-off-by: Florian Pritz --- application/config/config.php | 4 ++++ run-tests.sh | 5 +++++ 2 files changed, 9 insertions(+) diff --git a/application/config/config.php b/application/config/config.php index 8abf1ff6f..7aab610f3 100644 --- a/application/config/config.php +++ b/application/config/config.php @@ -646,3 +646,7 @@ if (file_exists(APPPATH.'config/config-local.php')) { if (getenv("ENVIRONMENT") === "testsuite" && isset($_SERVER['SERVER_PORT'])) { $config['base_url'] = 'http://127.0.0.1:'.$_SERVER['SERVER_PORT'].'/'; } + +if (getenv("ENVIRONMENT") === "testsuite") { + $config['upload_path'] = FCPATH.'testsuite-tmp'; +} diff --git a/run-tests.sh b/run-tests.sh index 89db85ee9..db6a977f4 100755 --- a/run-tests.sh +++ b/run-tests.sh @@ -7,6 +7,7 @@ export ENVIRONMENT="testsuite" export COLLECT_COVERAGE=1 startdir="$(dirname "$0")" +datadir="testsuite-tmp" die() { echo "$@" >&2 @@ -28,9 +29,13 @@ trap cleanup EXIT INT cleanup() { pkill -P $$ php index.php tools drop_all_tables + rm -rf "$datadir" } +rm -rf "$datadir" + mkdir -p test-coverage-data +mkdir -p "$datadir" php=(php) if ((COLLECT_COVERAGE)); then -- cgit v1.2.3-24-g4f1b