Skip to contentSkip to conversation

network: load test_net.sh after getopts

PATCH New Petr Vorel 2 participants 2 messages Nov 9, 2016 – Nov 11, 2016

lore
Share & tools
lore

Petr Vorel

author
#0 lore raw

PATCH 1/1 network: load test_net.sh after getopts

We shouldn't ask rsh/ssh password or require having set ssh pub keys just for displaying help.

Signed-off-by Petr Vorel <[email protected]>

---
Alexey, thanks a lot for your point, I overlooked the comment in the code.

v2: reset TST_TOTAL and TCID variables after loading test_net.sh

Signed-off-by Petr Vorel <[email protected]>
---
 testscripts/network.sh | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)
testscripts/network.sh +10 -10
index 66bacef..6b81823 100755
@@ -1,8 +1,5 @@
 #!/bin/sh
 
-TST_TOTAL=1
-TCID="network_settings"
-
 cd $(dirname $0)
 export LTPROOT=${LTPROOT:-"$PWD"}
 echo $LTPROOT | grep -q testscripts

@@ -11,8 +8,6 @@ if [ $? -eq 0 ]; then
 	export LTPROOT=${PWD}
 fi
 
-. test_net.sh
-
 export TMPDIR=/tmp/netpan-$$
 mkdir -p $TMPDIR
 CMDFILE=${TMPDIR}/network.tests

@@ -20,11 +15,6 @@ VERBOSE="no"
 
 export PATH="${PATH}:${LTPROOT}/testcases/bin"
 
-# Reset variables.
-# Don't break the tests which are using 'testcases/lib/cmdlib.sh'
-export TCID=
-export TST_LIB_LOADED=
-
 usage()
 {
 	echo "Usage: $0 OPTIONS"

@@ -81,6 +71,16 @@ if [ "$OPTIND" -eq 1 ]; then
 	exit 1
 fi
 
+TST_TOTAL=1
+TCID="network_settings"
+
+. test_net.sh
+
+# Reset variables.
+# Don't break the tests which are using 'testcases/lib/cmdlib.sh'
+export TCID=
+export TST_LIB_LOADED=
+
 rm -f $CMDFILE
 
 for t in $TEST_CASES; do
Signature · 1 line
2.10.2
Applied
#1 lore raw

PATCH 1/1 network: load test_net.sh after getopts

Hi,

Quoted 2 lines · Petr Vorel

We shouldn't ask rsh/ssh password or require having set ssh pub keys just for displaying help.

Applied patch. Thank you!

Best regards,
Alexey