Unverified Commit 2b0673c2 authored by K900's avatar K900 Committed by Vladimír Čunát
Browse files

opencolorio: fix tests on staging-next

parent 7d52ac6d

pkgs/development/libraries/opencolorio/default.nix

+2 −0
Original line number Diff line number Diff line
@@ -45,6 +45,8 @@ stdenv.mkDerivation rec { 
    # Workaround for https://gitlab.kitware.com/cmake/cmake/-/issues/25200.

    # Needed for zlib >= 1.3 && cmake < 3.27.4.

    ./broken-cmake-zlib-version.patch

    # Fix incorrect line number in test

    ./line-numbers.patch

  ];



  postPatch = lib.optionalString stdenv.isDarwin ''

pkgs/development/libraries/opencolorio/line-numbers.patch

0 → 100644
+13 −0
Original line number Diff line number Diff line 
diff --git a/tests/cpu/fileformats/FileFormatCTF_tests.cpp b/tests/cpu/fileformats/FileFormatCTF_tests.cpp

index 7a7ab67b..18c1f55e 100644

--- a/tests/cpu/fileformats/FileFormatCTF_tests.cpp

+++ b/tests/cpu/fileformats/FileFormatCTF_tests.cpp

@@ -1416,7 +1416,7 @@ OCIO_ADD_TEST(FileFormatCTF, difficult_xml_unknown_elements)

             "(37): Unrecognized element 'just_ignore' where its parent is 'ProcessList' (8): Unknown element",

             "(69): Unrecognized element 'just_ignore' where its parent is 'Description' (66)",

             "(70): Unrecognized element 'just_ignore' where its parent is 'just_ignore' (69)",

-            "(75): Unrecognized element 'Matrix' where its parent is 'LUT1D' (43): 'Matrix' not allowed in this element",

+            "(75): Unrecognized element 'Matrix' where its parent is 'LUT1D' (46): 'Matrix' not allowed in this element",

             "(76): Unrecognized element 'Description' where its parent is 'Matrix' (75)",

             "(77): Unrecognized element 'Array' where its parent is 'Matrix' (75)"

         };