[rt46602] Export environment variables in a portable manner

(cherry picked from commit 2c519531a704f3ff8a59520b24c9571222e205b6)
(cherry picked from commit 747df7d66a5271145a73b2d47f3633f31bf39e1f)
(cherry picked from commit ddb84ca0afb2dc5c0d2769429c6876199893eea8)

diff --git a/bin/tests/system/run.sh b/bin/tests/system/run.sh
index 073f09b6552c0ca4b2251a62a653cd1db916c0dc..6940f7a01b673ab5e8990f282c980c8057ec18e1 100644 (file)
--- a/bin/tests/system/run.sh
+++ b/bin/tests/system/run.sh
@@ -76,20 +76,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 88e08612e2ead49914db3272421defbcfcab4cfd..d0420696562b88fe8d4ef2e58ff03ef1166273d8 100644 (file)
--- a/bin/tests/system/runall.sh
+++ b/bin/tests/system/runall.sh
@@ -31,9 +31,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`
@@ -53,6 +55,7 @@ else
     exit 1
 fi
 
+export NOCLEAN
 make -j $numproc check
 
 exit $?