From 95447ce86a3b6747ea934075bd27f5721419e328 Mon Sep 17 00:00:00 2001 From: Todd Zullinger Date: Mon, 4 Jun 2018 23:43:49 -0400 Subject: [PATCH] Drop flaky & out-of-place netrc credential helper tests The default target in contrib/credential/netrc/Makefile is, and has always been, test. Running 'make -C contrib/credential/netrc/' in %build is not needed. Additionally, the tests recently were changed and require perl-Git to be installed before running. The tests also exit cleanly regardless of any failures encountered, which makes them unreliable. A fix for these issues will be submitted upstream, but rather than apply it here, simply drop the unneeded 'make' call. Ideally, the tests will be run in %check once fixed. This does present a small wrinkle due to the deletion of contrib/credential in %install. Cross that bridge when we get there. :) --- git.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/git.spec b/git.spec index 86cc543..af7f8e7 100644 --- a/git.spec +++ b/git.spec @@ -499,7 +499,6 @@ grep -rlZ '^use Git::LoadCPAN::' | xargs -r0 sed -i 's/Git::LoadCPAN:://g' %if %{libsecret} %make_build -C contrib/credential/libsecret/ %endif -make -C contrib/credential/netrc/ %make_build -C contrib/diff-highlight/ @@ -873,6 +872,7 @@ make test || ./print-failed-test-output %changelog * Mon Jun 04 2018 Todd Zullinger - 2.18.0-0.1.rc1 - Update to 2.18.0-rc1 +- Drop flaky & out-of-place netrc credential helper tests * Fri Jun 01 2018 Todd Zullinger - 2.18.0-0.0.rc0.1 - add -p: fix counting empty context lines in edited patches