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

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>

1 files changed, 9 insertions, 11 deletions

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