summary refs log tree commit diff
path: root/pkgs/development/libraries/libarchive
diff options
context:
space:
mode:
authorRobert Scott <code@humanleg.org.uk>2022-05-02 13:00:59 +0100
committerRobert Scott <code@humanleg.org.uk>2022-05-02 13:00:59 +0100
commit4aa18d9249777f24aee61690e6cf7aa1353b69d1 (patch)
tree2e864b20f8283cd0396d883f67924ec0577aa064 /pkgs/development/libraries/libarchive
parentfdaf2ed5409bd3cbafbf69820cc4543afc6f0169 (diff)
downloadnixpkgs-4aa18d9249777f24aee61690e6cf7aa1353b69d1.tar
nixpkgs-4aa18d9249777f24aee61690e6cf7aa1353b69d1.tar.gz
nixpkgs-4aa18d9249777f24aee61690e6cf7aa1353b69d1.tar.bz2
nixpkgs-4aa18d9249777f24aee61690e6cf7aa1353b69d1.tar.lz
nixpkgs-4aa18d9249777f24aee61690e6cf7aa1353b69d1.tar.xz
nixpkgs-4aa18d9249777f24aee61690e6cf7aa1353b69d1.tar.zst
nixpkgs-4aa18d9249777f24aee61690e6cf7aa1353b69d1.zip
libarchive: disable cpio file-access-time related tests
these are mysteriously flakey on some peoples darwin systems,
which could be the result of stray accesses or timezone
issues
Diffstat (limited to 'pkgs/development/libraries/libarchive')
-rw-r--r--pkgs/development/libraries/libarchive/default.nix17
1 files changed, 10 insertions, 7 deletions
diff --git a/pkgs/development/libraries/libarchive/default.nix b/pkgs/development/libraries/libarchive/default.nix
index 76e5a32316d..066ea8b60dd 100644
--- a/pkgs/development/libraries/libarchive/default.nix
+++ b/pkgs/development/libraries/libarchive/default.nix
@@ -40,18 +40,21 @@ stdenv.mkDerivation rec {
   postPatch = ''
     substituteInPlace Makefile.am --replace '/bin/pwd' "$(type -P pwd)"
 
-    declare -a skip_tests=(
+    declare -a skip_test_paths=(
       # test won't work in nix sandbox
-      'test_write_disk_perms'
+      'libarchive/test/test_write_disk_perms.c'
       # can't be sure builder will have sparse-capable fs
-      'test_sparse_basic'
+      'libarchive/test/test_sparse_basic.c'
       # can't even be sure builder will have hardlink-capable fs
-      'test_write_disk_hardlink'
+      'libarchive/test/test_write_disk_hardlink.c'
+      # access-time-related tests flakey on some systems
+      'cpio/test/test_option_a.c'
+      'cpio/test/test_option_t.c'
     )
 
-    for test_name in "''${skip_tests[@]}" ; do
-      sed -i "/$test_name/d" Makefile.am
-      rm "libarchive/test/$test_name.c"
+    for test_path in "''${skip_test_paths[@]}" ; do
+      substituteInPlace Makefile.am --replace "$test_path" ""
+      rm "$test_path"
     done
   '';