Skip to content

Commit d2554c7

Browse files
peffgitster
authored andcommitted
test-lib: add in-shell "env" replacement
The one-shot environment variable syntax: FOO=BAR some-program is unportable when some-program is actually a shell function, like test_must_fail (on some shells FOO remains set after the function returns, and on others it does not). We sometimes get around this by using env, like: test_must_fail env FOO=BAR some-program But that only works because test_must_fail's arguments are themselves a command which can be run. You can't run: env FOO=BAR test_must_fail some-program because env does not know about our shell functions. So there is no equivalent for test_commit, for example, and one must resort to: ( FOO=BAR export FOO test_commit ) which is a bit verbose. Let's add a version of "env" that works _inside_ the shell, by creating a subshell, exporting variables from its argument list, and running the command. Its use is demonstrated on a currently-unportable case in t4014. Signed-off-by: Jeff King <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 4b0891f commit d2554c7

File tree

2 files changed

+23
-1
lines changed

2 files changed

+23
-1
lines changed

t/t4014-format-patch.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1072,7 +1072,7 @@ test_expect_success '--from omits redundant in-body header' '
10721072
'
10731073

10741074
test_expect_success 'in-body headers trigger content encoding' '
1075-
GIT_AUTHOR_NAME="éxötìc" test_commit exotic &&
1075+
test_env GIT_AUTHOR_NAME="éxötìc" test_commit exotic &&
10761076
test_when_finished "git reset --hard HEAD^" &&
10771077
git format-patch -1 --stdout --from >patch &&
10781078
cat >expect <<-\EOF &&

t/test-lib-functions.sh

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -939,3 +939,25 @@ mingw_read_file_strip_cr_ () {
939939
eval "$1=\$$1\$line"
940940
done
941941
}
942+
943+
# Like "env FOO=BAR some-program", but run inside a subshell, which means
944+
# it also works for shell functions (though those functions cannot impact
945+
# the environment outside of the test_env invocation).
946+
test_env () {
947+
(
948+
while test $# -gt 0
949+
do
950+
case "$1" in
951+
*=*)
952+
eval "${1%%=*}=\${1#*=}"
953+
eval "export ${1%%=*}"
954+
shift
955+
;;
956+
*)
957+
"$@"
958+
exit
959+
;;
960+
esac
961+
done
962+
)
963+
}

0 commit comments

Comments
 (0)