CVS commit: pkgsrc/devel/git-cinnabar

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

Module Name:    pkgsrc
Committed By:   riastradh
Date:           Thu Dec  5 02:31:30 UTC 2024

Modified Files:
        pkgsrc/devel/git-cinnabar: Makefile distinfo
Added Files:
        pkgsrc/devel/git-cinnabar/patches: patch-tests_cinnabarclone.t
            patch-tests_push-refs.t

Log Message:
git-cinnabar: Run the cram tests too.

No revbump because this only affects bmake test -- no change to the
built package.

All the tests should pass on NetBSD 9 now (probably 10 too).  Issues
filed upstream for the patches needed to make this work.

Tidy Makefile style a little while here.


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 pkgsrc/devel/git-cinnabar/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/devel/git-cinnabar/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/devel/git-cinnabar/patches/patch-tests_cinnabarclone.t \
    pkgsrc/devel/git-cinnabar/patches/patch-tests_push-refs.t

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.16 pkgsrc/devel/git-cinnabar/Makefile:1.17
--- pkgsrc/devel/git-cinnabar/Makefile:1.16     Thu Dec  5 01:19:26 2024
+++ pkgsrc/devel/git-cinnabar/Makefile  Thu Dec  5 02:31:30 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2024/12/05 01:19:26 riastradh Exp $
+# $NetBSD: Makefile,v 1.17 2024/12/05 02:31:30 riastradh Exp $
 
 # does not contain the git submodules, please update GITHUB_SUBMODULES below
 .include "Makefile.common"
@@ -42,9 +42,28 @@ do-test:
        ${RUN} cd ${CARGO_WRKSRC} && \
        ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/cargo ${CARGO_TEST_ARGS}
 
+do-test: do-test-cargo
+do-test-cargo: .PHONY
+       @${STEP_MSG} Running cargo test
+       ${RUN} cd ${CARGO_WRKSRC} && \
+       ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/cargo ${CARGO_TEST_ARGS}
+
+TEST_DEPENDS+=         ${PYPKGPREFIX}-cram>=0:../../devel/py-cram
+
+# this.cannot.possibly.exist.invalid-tld appears in some tests that
+# check for exact error messages, so let that bypass the fake proxy.
+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} \
+           no_proxy=localhost,this.cannot.possibly.exist.invalid-tld \
+           ${PREFIX}/bin/cram ${PKG_VERBOSE:D--verbose} tests
+
 .include "cargo-depends.mk"
 
+.include "../../archivers/zstd/buildlink3.mk"
+.include "../../lang/python/application.mk"
 .include "../../lang/rust/cargo.mk"
 .include "../../www/curl/buildlink3.mk"
-.include "../../archivers/zstd/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/devel/git-cinnabar/distinfo
diff -u pkgsrc/devel/git-cinnabar/distinfo:1.7 pkgsrc/devel/git-cinnabar/distinfo:1.8
--- pkgsrc/devel/git-cinnabar/distinfo:1.7      Thu Dec  5 01:19:26 2024
+++ pkgsrc/devel/git-cinnabar/distinfo  Thu Dec  5 02:31:30 2024
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.7 2024/12/05 01:19:26 riastradh Exp $
+$NetBSD: distinfo,v 1.8 2024/12/05 02:31:30 riastradh Exp $
 
 BLAKE2s (addr2line-0.24.1.crate) = 6b7b4e5845873018da12292d582de9e8ec0be0edbac314cbbbfb7dad89d7a983
 SHA512 (addr2line-0.24.1.crate) = ffa53fcfbbccdec943410083aa5f44e93122e0b40dc45acfe00b454a02c5575549e9a61807d87080d1677da807fef695b6676036fec3ca079d2b841794dbc0b5
@@ -412,3 +412,5 @@ BLAKE2s (zstd-sys-2.0.13+zstd.1.5.6.crat
 SHA512 (zstd-sys-2.0.13+zstd.1.5.6.crate) = c1f0176ebd0914879d0060796776c7fe376293ce9bc9f8f07ee3b809932a75aa033881d59a1bc99b6cd9af85b8e225fc09bcfc96013e556d7c11f155b759ecbf
 Size (zstd-sys-2.0.13+zstd.1.5.6.crate) = 749090 bytes
 SHA1 (patch-git-core_ci_run-test-slice.sh) = 9c7bc2b52c677d96d77a4d842650828a23c3eccc
+SHA1 (patch-tests_cinnabarclone.t) = 054754e932eb52a04001da5cae96c5582dfacddc
+SHA1 (patch-tests_push-refs.t) = c6de59558337c8fe193df7166a9a4179cf3e14ca

Added files:

Index: pkgsrc/devel/git-cinnabar/patches/patch-tests_cinnabarclone.t
diff -u /dev/null pkgsrc/devel/git-cinnabar/patches/patch-tests_cinnabarclone.t:1.1
--- /dev/null   Thu Dec  5 02:31:30 2024
+++ pkgsrc/devel/git-cinnabar/patches/patch-tests_cinnabarclone.t       Thu Dec  5 02:31:30 2024
@@ -0,0 +1,16 @@
+$NetBSD: patch-tests_cinnabarclone.t,v 1.1 2024/12/05 02:31:30 riastradh Exp $
+
+Work around NetBSD differences in test output.
+https://github.com/glandium/git-cinnabar/issues/340
+
+--- tests/cinnabarclone.t.orig 2023-10-07 12:16:45.000000000 +0000
++++ tests/cinnabarclone.t
+@@ -110,7 +110,7 @@ TODO: Ideally, the error message would s
+   Cloning into 'repo-git'...
+   Fetching cinnabar metadata from http://localhost:8080/
+   \r (no-eol) (esc)
+-  ERROR unable to access 'http://localhost:8080/': Failed to connect to localhost port 8080.* (re)
++  ERROR unable to access 'http://localhost:8080/': .* (re)
+   \r (no-eol) (esc)
+   WARNING Falling back to normal clone.
+ 
Index: pkgsrc/devel/git-cinnabar/patches/patch-tests_push-refs.t
diff -u /dev/null pkgsrc/devel/git-cinnabar/patches/patch-tests_push-refs.t:1.1
--- /dev/null   Thu Dec  5 02:31:30 2024
+++ pkgsrc/devel/git-cinnabar/patches/patch-tests_push-refs.t   Thu Dec  5 02:31:30 2024
@@ -0,0 +1,16 @@
+$NetBSD: patch-tests_push-refs.t,v 1.1 2024/12/05 02:31:30 riastradh Exp $
+
+Don't rely on ~/.gitconfig to set user.name:
+https://github.com/glandium/git-cinnabar/issues/339
+
+--- tests/push-refs.t.orig     2024-10-22 18:57:11.000000000 +0000
++++ tests/push-refs.t
+@@ -375,7 +375,7 @@ Removing heads or branches is not suppor
+ 
+ Pushing/deleting tags is not supported.
+ 
+-  $ git -C repo-git -c user.email=foo@bar tag -m 'Tagged' the-tag
++  $ git -C repo-git -c user.name=foobar -c user.email=foo@bar tag -m 'Tagged' the-tag
+   $ git -C repo-git push origin --tags
+   To hg::.*/push-refs.t/repo-from-git (re)
+    ! [remote rejected] the-tag -> the-tag (Pushing tags is unsupported)