From 7ef43e566c884c099482bba54a2712f47fc193a6 Mon Sep 17 00:00:00 2001 From: Martin Schwaighofer Date: Wed, 27 Sep 2023 12:38:45 +0200 Subject: [PATCH] diffoscope: fix broken build due to cbfs tests for now The diffoscope build broke due to failing tests related to cbfs when coreboot-utils was updated from 4.20 to 4.21 with commit be6408699e598ea127c6a1a6da74ed27e95b819d. Thanks to aij on github for reporting this issue and bisecting to find the change in nixpkgs that introduced the issue. The tests disabled in this commit should be re-enabled when diffoscope or coreboot fix the underlying issue. See: https://github.com/NixOS/nixpkgs/issues/256896 --- pkgs/tools/misc/diffoscope/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/misc/diffoscope/default.nix b/pkgs/tools/misc/diffoscope/default.nix index 7daff3641a04..2b966474346d 100644 --- a/pkgs/tools/misc/diffoscope/default.nix +++ b/pkgs/tools/misc/diffoscope/default.nix @@ -245,8 +245,13 @@ python3.pkgs.buildPythonApplication rec { "test_symlink_root" ]; + disabledTestPaths = [ + # fails due to https://github.com/NixOS/nixpkgs/issues/256896 + # should be removed once that issue is resolved in coreboot or diffoscope + "tests/comparators/test_cbfs.py" + ] # Flaky tests on Darwin - disabledTestPaths = lib.optionals stdenv.isDarwin [ + ++ lib.optionals stdenv.isDarwin [ "tests/comparators/test_git.py" "tests/comparators/test_java.py" "tests/comparators/test_uimage.py"