From: Michał Kępień <michal@isc.org>
Date: Mon, 29 Jan 2018 11:33:33 +0000 (+0100)
Subject: [rt46602] Export environment variables in a portable manner
X-Git-Tag: v9.13.0~158^2~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2c519531a704f3ff8a59520b24c9571222e205b6;p=thirdparty%2Fbind9.git

[rt46602] Export environment variables in a portable manner
---

diff --git a/bin/tests/system/run.sh b/bin/tests/system/run.sh
index 9a7e472a42b..38ee8623f07 100644
--- a/bin/tests/system/run.sh
+++ b/bin/tests/system/run.sh
@@ -67,20 +67,33 @@ fi
 # ports.  Since the lowest numbered port (specified in the command line)
 # will usually be a multiple of 10, the names are chosen so that if this is
 # true, the last digit of EXTRAPORTn is "n".
-export PORT=$baseport
-export EXTRAPORT1=`expr $baseport + 1`
-export EXTRAPORT2=`expr $baseport + 2`
-export EXTRAPORT3=`expr $baseport + 3`
-export EXTRAPORT4=`expr $baseport + 4`
-export EXTRAPORT5=`expr $baseport + 5`
-export EXTRAPORT6=`expr $baseport + 6`
-export EXTRAPORT7=`expr $baseport + 7`
-export EXTRAPORT8=`expr $baseport + 8`
-export CONTROLPORT=`expr $baseport + 9`
-
-export LOWPORT=$baseport
-export HIGHPORT=`expr $baseport + $numport - 1`
-
+PORT=$baseport
+EXTRAPORT1=`expr $baseport + 1`
+EXTRAPORT2=`expr $baseport + 2`
+EXTRAPORT3=`expr $baseport + 3`
+EXTRAPORT4=`expr $baseport + 4`
+EXTRAPORT5=`expr $baseport + 5`
+EXTRAPORT6=`expr $baseport + 6`
+EXTRAPORT7=`expr $baseport + 7`
+EXTRAPORT8=`expr $baseport + 8`
+CONTROLPORT=`expr $baseport + 9`
+
+LOWPORT=$baseport
+HIGHPORT=`expr $baseport + $numport - 1`
+
+export PORT
+export EXTRAPORT1
+export EXTRAPORT2
+export EXTRAPORT3
+export EXTRAPORT4
+export EXTRAPORT5
+export EXTRAPORT6
+export EXTRAPORT7
+export EXTRAPORT8
+export CONTROLPORT
+
+export LOWPORT
+export HIGHPORT
 
 echostart "S:$systest:`date`"
 echoinfo  "T:$systest:1:A"
diff --git a/bin/tests/system/runall.sh b/bin/tests/system/runall.sh
index 95ebd292202..f5f9b87db38 100644
--- a/bin/tests/system/runall.sh
+++ b/bin/tests/system/runall.sh
@@ -22,9 +22,11 @@ SYSTEMTESTTOP=.
 
 usage="Usage: ./runall.sh [-n] [numprocesses]"
 
+NOCLEAN=""
+
 while getopts "n" flag; do
     case "$flag" in
-	n) export NOCLEAN="-n" ;;
+	n) NOCLEAN="-n" ;;
     esac
 done
 shift `expr $OPTIND - 1`
@@ -44,6 +46,7 @@ else
     exit 1
 fi
 
+export NOCLEAN
 make -j $numproc check
 
 exit $?