aboutsummaryrefslogtreecommitdiff
path: root/testcases/lib
diff options
context:
space:
mode:
authorPetr Vorel <pvorel@suse.cz>2018-07-02 16:21:44 +0200
committerPetr Vorel <pvorel@suse.cz>2018-07-04 17:53:35 +0200
commitecc29beeda4b3647a2e789ad193c8a6e66ec19cd (patch)
treee5566c866b36fa29b863589b709a5458d7e60603 /testcases/lib
parenta93c34f914554a5054034a3b49b942c0e336f09b (diff)
tst_net.sh: Harden library against deadlocks
Signed-off-by: Petr Vorel <pvorel@suse.cz> Reviewed-by: Alexey Kodanev <alexey.kodanev@oracle.com>
Diffstat (limited to 'testcases/lib')
-rw-r--r--testcases/lib/tst_net.sh13
1 files changed, 13 insertions, 0 deletions
diff --git a/testcases/lib/tst_net.sh b/testcases/lib/tst_net.sh
index 507d5b788..e55ac1ddc 100644
--- a/testcases/lib/tst_net.sh
+++ b/testcases/lib/tst_net.sh
@@ -78,6 +78,19 @@ tst_net_setup()
[ -n "$TST_USE_LEGACY_API" ] && . test.sh || . tst_test.sh
+if [ "$TST_PARSE_ARGS_CALLER" = "$TST_PARSE_ARGS" ]; then
+ tst_res TWARN "TST_PARSE_ARGS_CALLER same as TST_PARSE_ARGS, unset it ($TST_PARSE_ARGS)"
+ unset TST_PARSE_ARGS_CALLER
+fi
+if [ "$TST_SETUP_CALLER" = "$TST_SETUP" ]; then
+ tst_res TWARN "TST_SETUP_CALLER same as TST_SETUP, unset it ($TST_SETUP)"
+ unset TST_SETUP_CALLER
+fi
+if [ "$TST_USAGE_CALLER" = "$TST_USAGE" ]; then
+ tst_res TWARN "TST_USAGE_CALLER same as TST_USAGE, unset it ($TST_USAGE)"
+ unset TST_USAGE_CALLER
+fi
+
if [ -n "$TST_USE_LEGACY_API" ]; then
tst_net_read_opts "$@"
fi