[LTP] [PATCH 1/1] testscripts/network.sh: Don't load tst_net.sh

Petr Vorel pvorel@suse.cz
Wed Feb 8 10:23:27 CET 2023


This should not be needed any more for neither new API and legacy tests
since 04021637f4 ("tst_test.sh: Cleanup getopts usage")

This fixes wrong info when tests are run with network.sh:
    ping01 1 TINFO: using not default LTP netns: 'ns_exec 18242 net,mnt'

because we don't use any custom netns. In case loading is really needed,
we'd need to revert 0da2c285a1.

Fixes: 0da2c285a1 ("tst_net.sh: Remove unneeded $TST_INIT_NETNS variable")

Signed-off-by: Petr Vorel <pvorel@suse.cz>
---
 testscripts/network.sh | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/testscripts/network.sh b/testscripts/network.sh
index 15a4cc1c71..afe9c7a977 100755
--- a/testscripts/network.sh
+++ b/testscripts/network.sh
@@ -86,13 +86,6 @@ if [ "$OPTIND" -eq 1 ]; then
 fi
 shift $(($OPTIND - 1))
 
-TST_NO_DEFAULT_RUN=1
-. tst_net.sh
-
-# Reset variables.
-# Don't break the tests which are using 'testcases/lib/cmdlib.sh'
-unset TST_ID TST_LIB_LOADED TST_NO_DEFAULT_RUN
-
 rm -f $CMDFILE
 
 for t in $TEST_CASES; do
-- 
2.39.1



More information about the ltp mailing list