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.

(cherry picked from commit d989d20fe526716c774357ff372b38995e1e5065)
(cherry picked from commit 2cd174dda986f2a49ce821c132459fc45d1044e7)

diff --git a/bin/tests/system/runall.sh b/bin/tests/system/runall.sh
index ab333bdab29839a8bc6fd95cf2084408f90e1135..95c452ffe8c2cd2d57beca7311acd72d2e3b45fb 100644 (file)
--- a/bin/tests/system/runall.sh
+++ b/bin/tests/system/runall.sh
@@ -35,8 +35,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.