From 73750c2c08dc222fda30b90927965dcb0fb4617b Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Mon, 30 Dec 2024 21:14:17 +0100 Subject: [PATCH 1/5] lomiri.lomiri-ui-toolkit: Add mesa.llvmpipeHook, re-allow many tests mesa.llvmpipeHook makes https://gitlab.com/ubports/development/core/lomiri-ui-toolkit/-/issues/35 not a critical issue anymore --- .../2001-Mark-problematic-tests.patch | 155 ------------------ .../lomiri/qml/lomiri-ui-toolkit/default.nix | 4 +- 2 files changed, 2 insertions(+), 157 deletions(-) delete mode 100644 pkgs/desktops/lomiri/qml/lomiri-ui-toolkit/2001-Mark-problematic-tests.patch diff --git a/pkgs/desktops/lomiri/qml/lomiri-ui-toolkit/2001-Mark-problematic-tests.patch b/pkgs/desktops/lomiri/qml/lomiri-ui-toolkit/2001-Mark-problematic-tests.patch deleted file mode 100644 index 7f2a4daab5656..0000000000000 --- a/pkgs/desktops/lomiri/qml/lomiri-ui-toolkit/2001-Mark-problematic-tests.patch +++ /dev/null @@ -1,155 +0,0 @@ -From c71d5fed4ef1f0b6d56400cddf02d8ac438168c8 Mon Sep 17 00:00:00 2001 -From: OPNA2608 -Date: Wed, 17 Apr 2024 16:18:23 +0200 -Subject: [PATCH] Mark problematic tests - -- ShapeMaterial requires a Qt OpenGL context, doesn't work in our sandbox -- SignalSpy on QML shaders compilers don't see changes -- TypeError on some properties with Qt 5.15 - https://gitlab.com/ubports/development/core/lomiri-ui-toolkit/-/issues/9 ---- - tests/checkresults.sh | 88 ++++++++++++++++++++++++++++++++++++++++--- - 1 file changed, 82 insertions(+), 6 deletions(-) - -diff --git a/tests/checkresults.sh b/tests/checkresults.sh -index fc498985e..b5d204d0d 100755 ---- a/tests/checkresults.sh -+++ b/tests/checkresults.sh -@@ -22,6 +22,7 @@ ERRORS_PATTERN=' Date: Mon, 30 Dec 2024 21:17:24 +0100 Subject: [PATCH 2/5] lomiri.lomiri-ui-extras: Add mesa.llvmpipeHook, re-allow affected test(s) --- pkgs/desktops/lomiri/qml/lomiri-ui-extras/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/lomiri/qml/lomiri-ui-extras/default.nix b/pkgs/desktops/lomiri/qml/lomiri-ui-extras/default.nix index b76ec5eca94fc..800163372b0a1 100644 --- a/pkgs/desktops/lomiri/qml/lomiri-ui-extras/default.nix +++ b/pkgs/desktops/lomiri/qml/lomiri-ui-extras/default.nix @@ -8,6 +8,7 @@ cups, exiv2, lomiri-ui-toolkit, + mesa, pam, pkg-config, qtbase, @@ -48,6 +49,7 @@ stdenv.mkDerivation (finalAttrs: { ]; nativeCheckInputs = [ + mesa.llvmpipeHook # ShapeMaterial needs an OpenGL context: https://gitlab.com/ubports/development/core/lomiri-ui-toolkit/-/issues/35 qtdeclarative # qmltestrunner xvfb-run ]; @@ -66,8 +68,6 @@ stdenv.mkDerivation (finalAttrs: { "-E" (lib.strings.escapeShellArg "(${ lib.concatStringsSep "|" [ - # tst_busy_indicator runs into a codepath in lomiri-ui-toolkit that expects a working GL context - "^tst_busy_indicator" # Photo & PhotoImageProvider Randomly fail, unsure why "^tst_PhotoEditorPhoto" ] From 3609c77cec51db4d34b01f6edfa33bad0886e619 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Mon, 30 Dec 2024 21:46:49 +0100 Subject: [PATCH 3/5] lomiri.lomiri-system-settings-unwrapped: Add mesa.llvmpipeHook, re-allow affected test(s) --- .../lomiri-system-settings/default.nix | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/pkgs/desktops/lomiri/applications/lomiri-system-settings/default.nix b/pkgs/desktops/lomiri/applications/lomiri-system-settings/default.nix index 6085f4d1b5fbf..7b29df5877079 100644 --- a/pkgs/desktops/lomiri/applications/lomiri-system-settings/default.nix +++ b/pkgs/desktops/lomiri/applications/lomiri-system-settings/default.nix @@ -29,6 +29,7 @@ lomiri-settings-components, lomiri-ui-toolkit, maliit-keyboard, + mesa, pkg-config, polkit, python3, @@ -136,6 +137,7 @@ stdenv.mkDerivation (finalAttrs: { nativeCheckInputs = [ dbus + mesa.llvmpipeHook # ShapeMaterial needs an OpenGL context: https://gitlab.com/ubports/development/core/lomiri-ui-toolkit/-/issues/35 (python3.withPackages (ps: with ps; [ python-dbusmock ])) xvfb-run ]; @@ -151,19 +153,6 @@ stdenv.mkDerivation (finalAttrs: { cmakeFlags = [ (lib.cmakeBool "ENABLE_LIBDEVICEINFO" true) (lib.cmakeBool "ENABLE_TESTS" finalAttrs.finalPackage.doCheck) - (lib.cmakeFeature "CMAKE_CTEST_ARGUMENTS" ( - lib.concatStringsSep ";" [ - # Exclude tests - "-E" - (lib.strings.escapeShellArg "(${ - lib.concatStringsSep "|" [ - # Hits OpenGL context issue inside lomiri-ui-toolkit, see derivation of that on details - "^testmouse" - "^tst_notifications" - ] - })") - ] - )) ]; # The linking for this normally ignores missing symbols, which is inconvenient for figuring out why subpages may be From 198305bfacb62317333646d63a5a00f8b72c04d0 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Mon, 30 Dec 2024 21:49:41 +0100 Subject: [PATCH 4/5] lomiri.lomiri-clock-app: Add mesa.llvmpipeHook, re-allow affected test(s) --- .../applications/lomiri-clock-app/default.nix | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/pkgs/desktops/lomiri/applications/lomiri-clock-app/default.nix b/pkgs/desktops/lomiri/applications/lomiri-clock-app/default.nix index e219b16428bf8..a3f62cdc4503f 100644 --- a/pkgs/desktops/lomiri/applications/lomiri-clock-app/default.nix +++ b/pkgs/desktops/lomiri/applications/lomiri-clock-app/default.nix @@ -12,6 +12,7 @@ lomiri-sounds, lomiri-ui-toolkit, makeWrapper, + mesa, pkg-config, qtbase, qtdeclarative, @@ -77,6 +78,7 @@ stdenv.mkDerivation (finalAttrs: { ]; nativeCheckInputs = [ + mesa.llvmpipeHook # ShapeMaterial needs an OpenGL context: https://gitlab.com/ubports/development/core/lomiri-ui-toolkit/-/issues/35 qtdeclarative # qmltestrunner xvfb-run ]; @@ -87,20 +89,6 @@ stdenv.mkDerivation (finalAttrs: { (lib.cmakeBool "CLICK_MODE" false) (lib.cmakeBool "INSTALL_TESTS" false) (lib.cmakeBool "USE_XVFB" true) - (lib.cmakeFeature "CMAKE_CTEST_ARGUMENTS" ( - lib.concatStringsSep ";" [ - # Exclude tests - "-E" - (lib.strings.escapeShellArg "(${ - lib.concatStringsSep "|" [ - # Runs into ShapeMaterial codepath in lomiri-ui-toolkit which needs OpenGL, see LUITK for details - "^AlarmLabel" - "^AlarmRepeat" - "^AlarmSound" - ] - })") - ] - )) ]; doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; From 610ec2c78b0473065628ee36feec9c63425ea2ec Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Mon, 30 Dec 2024 21:53:54 +0100 Subject: [PATCH 5/5] lomiri.morph-browser: Add mesa.llvmpipeHook, re-allow affected test(s) --- pkgs/desktops/lomiri/applications/morph-browser/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/lomiri/applications/morph-browser/default.nix b/pkgs/desktops/lomiri/applications/morph-browser/default.nix index 40646d439901e..dd1390ce54750 100644 --- a/pkgs/desktops/lomiri/applications/morph-browser/default.nix +++ b/pkgs/desktops/lomiri/applications/morph-browser/default.nix @@ -12,6 +12,7 @@ lomiri-content-hub, lomiri-ui-extras, lomiri-ui-toolkit, + mesa, pkg-config, qqc2-suru-style, qtbase, @@ -90,6 +91,7 @@ stdenv.mkDerivation (finalAttrs: { ]; nativeCheckInputs = [ + mesa.llvmpipeHook # ShapeMaterial needs an OpenGL context: https://gitlab.com/ubports/development/core/lomiri-ui-toolkit/-/issues/35 xvfb-run ]; @@ -102,9 +104,6 @@ stdenv.mkDerivation (finalAttrs: { lib.concatStringsSep "|" [ # Don't care about linter failures "^flake8" - - # Runs into ShapeMaterial codepath in lomiri-ui-toolkit which needs OpenGL, see LUITK for details - "^tst_QmlTests" ] })") ]