From: Michał Kępień <michal@isc.org>
Date: Wed, 21 Feb 2018 13:59:38 +0000 (+0100)
Subject: Preserve values of environment variables which are already set
X-Git-Tag: v9.13.0~139^2
X-Git-Url: http://git.ipfire.org/gitweb/index.cgi?a=commitdiff_plain;h=d989d20fe526716c774357ff372b38995e1e5065;p=thirdparty%2Fbind9.git

Preserve values of environment variables which are already set

This enables the environment variables controlling run.sh behavior to be
permanently set in a working environment (e.g. to automatically force
colored output without using "-c" in each runall.sh invocation).

Relevant runall.sh command line arguments still have a higher priority.
---

diff --git a/bin/tests/system/runall.sh b/bin/tests/system/runall.sh
index 284a6a50d4a..5bb0b589ac1 100644
--- a/bin/tests/system/runall.sh
+++ b/bin/tests/system/runall.sh
@@ -26,8 +26,10 @@ SYSTEMTESTTOP=.
 
 usage="Usage: ./runall.sh [-c] [-n] [numprocesses]"
 
-SYSTEMTEST_FORCE_COLOR=0
-SYSTEMTEST_NO_CLEAN=0
+# Preserve values of environment variables which are already set.
+
+SYSTEMTEST_FORCE_COLOR=${SYSTEMTEST_FORCE_COLOR:-0}
+SYSTEMTEST_NO_CLEAN=${SYSTEMTEST_NO_CLEAN:-0}
 
 # Handle command line switches if present.