From 82c62d132e3f8a087bdaa6941800fcd157dffa99 Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Sun, 2 Feb 2025 13:50:17 +0100
Subject: [PATCH] nixosTests.terminal-emulators.lomiri-terminal-app: Drop

---
 nixos/tests/lomiri.nix                                     | 5 -----
 nixos/tests/terminal-emulators.nix                         | 5 -----
 .../lomiri/applications/lomiri-terminal-app/default.nix    | 7 ++++++-
 3 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/nixos/tests/lomiri.nix b/nixos/tests/lomiri.nix
index 4e400ccf121e..dbc99843d556 100644
--- a/nixos/tests/lomiri.nix
+++ b/nixos/tests/lomiri.nix
@@ -256,9 +256,6 @@ in
               machine.send_key("ctrl-alt-t")
               wait_for_text(r"(${user}|machine)")
               machine.screenshot("terminal_opens")
-
-              # lomiri-terminal-app has a separate VM test to test its basic functionality
-
               machine.send_key("alt-f4")
 
           # We want the ability to launch applications
@@ -449,8 +446,6 @@ in
               wait_for_text(r"(${user}|machine)")
               machine.screenshot("terminal_opens")
 
-              # lomiri-terminal-app has a separate VM test to test its basic functionality
-
               # for the LSS lomiri-content-hub test to work reliably, we need to kick off peer collecting
               machine.send_chars("lomiri-content-hub-test-importer\n")
               wait_for_text(r"(/build/source|hub.cpp|handler.cpp|void|virtual|const)") # awaiting log messages from lomiri-content-hub
diff --git a/nixos/tests/terminal-emulators.nix b/nixos/tests/terminal-emulators.nix
index 3fc820d3ac8b..6b209b8b3368 100644
--- a/nixos/tests/terminal-emulators.nix
+++ b/nixos/tests/terminal-emulators.nix
@@ -65,11 +65,6 @@ let
 
     konsole.pkg = p: p.plasma5Packages.konsole;
 
-    lomiri-terminal-app.pkg = p: p.lomiri.lomiri-terminal-app;
-    # after recent Mesa change, borked software rendering config under x86_64 icewm?
-    # BGR colour display on x86_64, RGB on aarch64
-    lomiri-terminal-app.colourTest = false;
-
     lxterminal.pkg = p: p.lxterminal;
 
     mate-terminal.pkg = p: p.mate.mate-terminal;
diff --git a/pkgs/desktops/lomiri/applications/lomiri-terminal-app/default.nix b/pkgs/desktops/lomiri/applications/lomiri-terminal-app/default.nix
index 6701f56b35ec..3fc7c5432716 100644
--- a/pkgs/desktops/lomiri/applications/lomiri-terminal-app/default.nix
+++ b/pkgs/desktops/lomiri/applications/lomiri-terminal-app/default.nix
@@ -61,7 +61,12 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   passthru = {
-    tests.vm-test = nixosTests.terminal-emulators.lomiri-terminal-app;
+    tests = {
+      # The way the test works sometimes causes segfaults in qtfeedback
+      # https://gitlab.com/ubports/development/apps/lomiri-terminal-app/-/issues/117
+      # vm-test = nixosTests.terminal-emulators.lomiri-terminal-app;
+      inherit (nixosTests.lomiri) desktop-basics desktop-appinteractions;
+    };
     updateScript = gitUpdater {
       rev-prefix = "v";
     };