CVS commit: pkgsrc/devel/git-cinnabar

["Taylor R Campbell" <riastradh%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   riastradh
Date:           Thu Dec  5 13:59:31 UTC 2024

Modified Files:
        pkgsrc/devel/git-cinnabar: Makefile

Log Message:
devel/git-cinnabar: Make tests work before installation.

And make sure we override any previously installed git-cinnabar (and
git-remote-hg) executables in libexec/git-core (`git exec path').

Creating a symlink under ${WRKSRC}/target/release is a little hokey,
but it'll do.


To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 pkgsrc/devel/git-cinnabar/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/git-cinnabar/Makefile
diff -u pkgsrc/devel/git-cinnabar/Makefile:1.18 pkgsrc/devel/git-cinnabar/Makefile:1.19
--- pkgsrc/devel/git-cinnabar/Makefile:1.18     Thu Dec  5 07:55:56 2024
+++ pkgsrc/devel/git-cinnabar/Makefile  Thu Dec  5 13:59:31 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2024/12/05 07:55:56 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2024/12/05 13:59:31 riastradh Exp $
 
 # does not contain the git submodules, please update GITHUB_SUBMODULES below
 .include "Makefile.common"
@@ -57,7 +57,9 @@ do-test: do-test-cram
 do-test-cram: .PHONY
        @${STEP_MSG} Running cram tests
        ${RUN} cd ${CARGO_WRKSRC} && \
-       ${SETENV} ${MAKE_ENV} PATH=${CARGO_WRKSRC}/target/release:${PATH:Q} \
+       ${LN} -sf git-cinnabar target/release/git-remote-hg && \
+       ${SETENV} ${MAKE_ENV} \
+           GIT_EXEC_PATH=${CARGO_WRKSRC}/target/release:"`git --exec-path`" \
            no_proxy=localhost,this.cannot.possibly.exist.invalid-tld \
            ${PREFIX}/bin/cram-${PYVERSSUFFIX} ${PKG_VERBOSE:D--verbose} tests