diff options
| author | Petr Vorel <pvorel@suse.cz> | 2016-11-09 15:35:39 +0100 |
|---|---|---|
| committer | Alexey Kodanev <alexey.kodanev@oracle.com> | 2016-11-11 11:49:51 +0300 |
| commit | 35edc262a4f627cdd0ed4e55529953fe8fd94771 (patch) | |
| tree | dd3d2d66da60414333e721d3874c78b240e9dcb0 /testscripts/network.sh | |
| parent | 17fdb433e4fedae643baea228cd4af346a4344a3 (diff) | |
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 <pvorel@suse.cz>
Diffstat (limited to 'testscripts/network.sh')
| -rwxr-xr-x | testscripts/network.sh | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/testscripts/network.sh b/testscripts/network.sh index 66bacefe7..6b81823f9 100755 --- a/testscripts/network.sh +++ b/testscripts/network.sh @@ -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 |