mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

t0001: fix GIT_* environment variable check under --valgrind

Browse Source 
When a test case is run without --valgrind, the wrap-for-bin.sh
helper script inserts the environment variable GIT_TEXTDOMAINDIR, but
when run with --valgrind, the variable is missing. A recently
introduced test case expects the presence of the variable, though, and
fails under --valgrind.

Rewrite the test case to strip conditially defined environment variables
from both expected and actual output.

Signed-off-by: Johannes Sixt <j6t@kdbg.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Johannes Sixt
2016-03-03 07:55:17 +01:00
committed by Junio C Hamano
parent 8384c139cb
commit f3858f8edc
1 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
t/t0001-init.sh
View File

@ -88,19 +88,17 @@ test_expect_success 'plain nested in bare through aliased command' '
' '
test_expect_success 'No extra GIT_* on alias scripts' ' test_expect_success 'No extra GIT_* on alias scripts' '
( write_script script <<-\EOF &&
env | sed -ne "/^GIT_/s/=.*//p" && env |
echo GIT_PREFIX && # setup.c sed -n \
echo GIT_TEXTDOMAINDIR # wrapper-for-bin.sh -e "/^GIT_PREFIX=/d" \
) | sort | uniq >expected && -e "/^GIT_TEXTDOMAINDIR=/d" \
cat <<-\EOF >script && -e "/^GIT_/s/=.*//p" |
#!/bin/sh sort
env | sed -ne "/^GIT_/s/=.*//p" | sort >actual
exit 0
EOF EOF
chmod 755 script && ./script >expected &&
git config alias.script \!./script && git config alias.script \!./script &&
( mkdir sub && cd sub && git script ) && ( mkdir sub && cd sub && git script >../actual ) &&
test_cmp expected actual test_cmp expected actual
' '