about summary refs log tree commit diff
path: root/pkgs/applications
diff options
context:
space:
mode:
authorDaiderd Jordan <daiderd@gmail.com>2019-11-20 18:41:33 +0100
committerDaiderd Jordan <daiderd@gmail.com>2019-11-22 21:02:21 +0100
commit185e30c664467f2b5411dbec2aa9a6f2e0867d85 (patch)
treea51a2ba0098f58c3ea01573beb2bb036fc22af73 /pkgs/applications
parent783184f7724c7f340c2b76a555b42ea67c5ff670 (diff)
downloadnixlib-185e30c664467f2b5411dbec2aa9a6f2e0867d85.tar
nixlib-185e30c664467f2b5411dbec2aa9a6f2e0867d85.tar.gz
nixlib-185e30c664467f2b5411dbec2aa9a6f2e0867d85.tar.bz2
nixlib-185e30c664467f2b5411dbec2aa9a6f2e0867d85.tar.lz
nixlib-185e30c664467f2b5411dbec2aa9a6f2e0867d85.tar.xz
nixlib-185e30c664467f2b5411dbec2aa9a6f2e0867d85.tar.zst
nixlib-185e30c664467f2b5411dbec2aa9a6f2e0867d85.zip
git: disable failing test on darwin
The tests for null patterns where changed in 25754125cef278c7e9492fbd6dc4a28319b01f18,
it's possible utf-8 normalisation is causing different behaviour here.

    not ok 54 - LC_ALL='C' git grep -P -f f -i 'Æ<NUL>[Ð]' a
    not ok 57 - LC_ALL='C' git grep -P -f f -i '[Æ]<NUL>Ð' a
    not ok 60 - LC_ALL='C' git grep -P -f f -i '[Æ]<NUL>ð' a
    not ok 63 - LC_ALL='C' git grep -P -f f -i 'Æ<NUL>Ð' a
    Dubious, test returned 1 (wstat 256, 0x100)
    Failed 4/145 subtests
            (less 48 skipped subtests: 93 okay)
Diffstat (limited to 'pkgs/applications')
-rw-r--r--pkgs/applications/version-management/git-and-tools/git/default.nix4
1 files changed, 4 insertions, 0 deletions
diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix
index a6b53561771d..a8e284c6fec7 100644
--- a/pkgs/applications/version-management/git-and-tools/git/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git/default.nix
@@ -298,6 +298,10 @@ stdenv.mkDerivation {
 
     # As of 2.19.0, t5562 refers to #!/usr/bin/perl
     patchShebangs t/t5562/invoke-with-content-length.pl
+  '' + stdenv.lib.optionalString stdenv.isDarwin ''
+    # XXX: Some tests added in 2.24.0 fail.
+    # Please try to re-enable on the next release.
+    disable_test t7816-grep-binary-pattern
   '' + stdenv.lib.optionalString stdenv.hostPlatform.isMusl ''
     # Test fails (as of 2.17.0, musl 1.1.19)
     disable_test t3900-i18n-commit