Merge pull request #43810 from yesbox/bfs

bfs: enable the test_fstype test
2018-07-25 13:22:46 -04:00 · 2018-07-25 13:22:46 -04:00 · 0aa2a93d12
commit 0aa2a93d12
parent 6fbcbaf404 9877ba507b
2 changed files with 0 additions and 12 deletions
--- a/pkgs/tools/system/bfs/default.nix
+++ b/pkgs/tools/system/bfs/default.nix
@ -11,8 +11,6 @@ stdenv.mkDerivation rec {
    sha256 = "01vcqanj2sifa5i51wvrkxh55d6hrq6iq7zmnhv4ls221dqmbyyn";
  };

-  # Disable fstype test, tries to read /etc/mtab
-  patches = [ ./tests.patch ];
  postPatch = ''
    # Patch tests (both shebangs and usage in scripts)
    for f in $(find -type f -name '*.sh'); do
--- a/pkgs/tools/system/bfs/tests.patch
+++ b/pkgs/tools/system/bfs/tests.patch
@ -1,10 +0,0 @@
--- a/tests.sh
-+++ b/tests.sh
-@@ -369,7 +369,6 @@
-     test_printf_nul
-     test_quit_after_print
-     test_quit_before_print
-    test_fstype
-     test_not
-     test_and
-     test_or