[gentoo-commits] repo/gentoo:master commit in: dev-vcs/git/

[Sam James]

commit:     d41ccfca6ff4e0ec8652b6808070f9b718e74413
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 22 11:25:37 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Sep 22 11:26:31 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d41ccfca

dev-vcs/git: fixup netrc test handling

* Use emake for cleaner error handling
* Always give verbose logs
* Fix directory

Signed-off-by: Sam James <sam <AT> gentoo.org>

 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 0247cf6cb525..6112d2fa6228 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 0247cf6cb525..6112d2fa6228 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 0247cf6cb525..6112d2fa6228 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
 }