From 68912919538e028fb57e14ca2fb3ad19eb743850 Mon Sep 17 00:00:00 2001 From: Tom Krizek Date: Fri, 12 Jan 2024 15:03:53 +0100 Subject: [PATCH] Export variable in resolver system test Variable assignment when calling subroutines might not be portable. Notably, it doesn't work with FreeBSD shell, where the value of HOME would be ignored in this case. Since the commands are already executed in a subshell, export the HOME variable to ensure it is properly handled in all shells. (cherry picked from commit 86a192cecea5413db85b30fb478cc48986452fe4) --- bin/tests/system/resolver/tests.sh | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/bin/tests/system/resolver/tests.sh b/bin/tests/system/resolver/tests.sh index f24939e1c3..322689e116 100755 --- a/bin/tests/system/resolver/tests.sh +++ b/bin/tests/system/resolver/tests.sh @@ -629,9 +629,21 @@ n=$((n + 1)) echo_i "check that '-t aaaa' in .digrc does not have unexpected side effects ($n)" ret=0 echo "-t aaaa" >.digrc -(HOME="$(pwd)" dig_with_opts @10.53.0.4 . >dig.out.1.${n}) || ret=1 -(HOME="$(pwd)" dig_with_opts @10.53.0.4 . A >dig.out.2.${n}) || ret=1 -(HOME="$(pwd)" dig_with_opts @10.53.0.4 -x 127.0.0.1 >dig.out.3.${n}) || ret=1 +( + HOME="$(pwd)" + export HOME + dig_with_opts @10.53.0.4 . >dig.out.1.${n} +) || ret=1 +( + HOME="$(pwd)" + export HOME + dig_with_opts @10.53.0.4 . A >dig.out.2.${n} +) || ret=1 +( + HOME="$(pwd)" + export HOME + dig_with_opts @10.53.0.4 -x 127.0.0.1 >dig.out.3.${n} +) || ret=1 grep ';\..*IN.*AAAA$' dig.out.1.${n} >/dev/null || ret=1 grep ';\..*IN.*A$' dig.out.2.${n} >/dev/null || ret=1 grep 'extra type option' dig.out.2.${n} >/dev/null && ret=1