From d41ccfca6ff4e0ec8652b6808070f9b718e74413 Mon Sep 17 00:00:00 2001 From: Sam James Date: Sun, 22 Sep 2024 12:25:37 +0100 Subject: [PATCH] dev-vcs/git: fixup netrc test handling * Use emake for cleaner error handling * Always give verbose logs * Fix directory Signed-off-by: Sam James --- dev-vcs/git/git-2.46.0.ebuild | 5 ++--- dev-vcs/git/git-2.46.1.ebuild | 5 ++--- dev-vcs/git/git-9999.ebuild | 5 ++--- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/dev-vcs/git/git-2.46.0.ebuild b/dev-vcs/git/git-2.46.0.ebuild index 0247cf6cb525f..6112d2fa62286 100644 --- a/dev-vcs/git/git-2.46.0.ebuild +++ b/dev-vcs/git/git-2.46.0.ebuild @@ -487,10 +487,9 @@ src_test() { # And bail if there was a problem [[ ${rc} -eq 0 ]] || die "Tests failed. Please file a bug!" + popd &>/dev/null || die if use perl ; then - make -C contrib/credential/netrc test || \ - make -C contrib/credential/netrc testverbose || \ - die "Tests failed for git-credential-netrc failed. Please file a bug!" + emake -C contrib/credential/netrc testverbose fi } diff --git a/dev-vcs/git/git-2.46.1.ebuild b/dev-vcs/git/git-2.46.1.ebuild index 0247cf6cb525f..6112d2fa62286 100644 --- a/dev-vcs/git/git-2.46.1.ebuild +++ b/dev-vcs/git/git-2.46.1.ebuild @@ -487,10 +487,9 @@ src_test() { # And bail if there was a problem [[ ${rc} -eq 0 ]] || die "Tests failed. Please file a bug!" + popd &>/dev/null || die if use perl ; then - make -C contrib/credential/netrc test || \ - make -C contrib/credential/netrc testverbose || \ - die "Tests failed for git-credential-netrc failed. Please file a bug!" + emake -C contrib/credential/netrc testverbose fi } diff --git a/dev-vcs/git/git-9999.ebuild b/dev-vcs/git/git-9999.ebuild index 0247cf6cb525f..6112d2fa62286 100644 --- a/dev-vcs/git/git-9999.ebuild +++ b/dev-vcs/git/git-9999.ebuild @@ -487,10 +487,9 @@ src_test() { # And bail if there was a problem [[ ${rc} -eq 0 ]] || die "Tests failed. Please file a bug!" + popd &>/dev/null || die if use perl ; then - make -C contrib/credential/netrc test || \ - make -C contrib/credential/netrc testverbose || \ - die "Tests failed for git-credential-netrc failed. Please file a bug!" + emake -C contrib/credential/netrc testverbose fi }