lomiri.*: Add mesa.llvmpipeHook, re-allow affected test(s) (#369525)

NixOS · Jan 8, 2025 · 0b5b716 · 0b5b716
2 parents 0bada71 + 610ec2c
commit 0b5b716
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 189 deletions.
diff --git 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;

diff --git 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

diff --git 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"
           ]
         })")
       ]

diff --git 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"
           ]

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
diff --git a/pkgs/desktops/lomiri/qml/lomiri-ui-toolkit/default.nix b/pkgs/desktops/lomiri/qml/lomiri-ui-toolkit/default.nix
@@ -10,6 +10,7 @@
   gdb,
   glib,
   lttng-ust,
+  mesa,
   perl,
   pkg-config,
   python3,
@@ -60,8 +61,6 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   patches = [
-    ./2001-Mark-problematic-tests.patch
-
     (substituteAll {
       src = ./2002-Nixpkgs-versioned-QML-path.patch.in;
       name = "2002-Nixpkgs-versioned-QML-path.patch";
@@ -149,6 +148,7 @@ stdenv.mkDerivation (finalAttrs: {
     dbus-test-runner
     dpkg # `dpkg-architecture -qDEB_HOST_ARCH` response decides how tests are run
     gdb
+    mesa.llvmpipeHook # ShapeMaterial needs an OpenGL context: https://gitlab.com/ubports/development/core/lomiri-ui-toolkit/-/issues/35
     xvfb-run
   ];