Skip to content

Commit 29d8e21

Browse files
avargitster
authored andcommitted
log test: skip a failing mkstemp() test under valgrind
Skip a test added in f1e3df3 (t: increase test coverage of signature verification output, 2020-03-04) when running under valgrind. Due to valgrind's interception of mkstemp() this test will fail with: + pwd + TMPDIR=[...]/t/trash directory.t4202-log/bogus git log --show-signature -n1 plain-fail ==7696== VG_(mkstemp): failed to create temp file: [...]/t/trash directory.t4202-log/bogus/valgrind_proc_7696_cmdline_d545ddcf [... 10 more similar lines omitted ..] valgrind: Startup or configuration error: valgrind: Can't create client cmdline file in [...]/t/trash directory.t4202-log/bogus/valgrind_proc_7696_cmdline_6e542d1d valgrind: Unable to start up properly. Giving up. error: last command exited with $?=1 Signed-off-by: Ævar Arnfjörð Bjarmason <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 58407e0 commit 29d8e21

File tree

1 file changed

+7
-4
lines changed

1 file changed

+7
-4
lines changed

t/t4202-log.sh

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1992,10 +1992,13 @@ test_expect_success GPG 'log --show-signature for merged tag with GPG failure' '
19921992
git tag -s -m signed_tag_msg signed_tag_fail &&
19931993
git checkout plain-fail &&
19941994
git merge --no-ff -m msg signed_tag_fail &&
1995-
TMPDIR="$(pwd)/bogus" git log --show-signature -n1 plain-fail >actual &&
1996-
grep "^merged tag" actual &&
1997-
grep "^No signature" actual &&
1998-
! grep "^gpg: Signature made" actual
1995+
if ! test_have_prereq VALGRIND
1996+
then
1997+
TMPDIR="$(pwd)/bogus" git log --show-signature -n1 plain-fail >actual &&
1998+
grep "^merged tag" actual &&
1999+
grep "^No signature" actual &&
2000+
! grep "^gpg: Signature made" actual
2001+
fi
19992002
'
20002003

20012004
test_expect_success GPGSM 'log --graph --show-signature for merged tag x509' '

0 commit comments

Comments
 (0)