guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

branch master updated: gnu: kwayland: Use qt-build-system and enable all


From: guix-commits
Subject: branch master updated: gnu: kwayland: Use qt-build-system and enable all tests.
Date: Sat, 15 Oct 2022 19:26:36 -0400

This is an automated email from the git hooks/post-receive script.

mbakke pushed a commit to branch master
in repository guix.

The following commit(s) were added to refs/heads/master by this push:
     new 617c083e7b gnu: kwayland: Use qt-build-system and enable all tests.
617c083e7b is described below

commit 617c083e7b50a189cf8cc1886a2365099df50a10
Author: Marius Bakke <marius@gnu.org>
AuthorDate: Sun Oct 16 01:12:35 2022 +0200

    gnu: kwayland: Use qt-build-system and enable all tests.
    
    * gnu/packages/kde-frameworks.scm (kwayland)[build-system]: Change to
    QT-BUILD-SYSTEM to avoid overriding the check phase, and to get verbose 
output
    on failure.
    [arguments]: Add #:parallel-build?.  Remove skip-specific-tests phase.  
Don't
    override check phase, but add new to set XDG_RUNTIME_DIR.
---
 gnu/packages/kde-frameworks.scm | 23 +++++++++--------------
 1 file changed, 9 insertions(+), 14 deletions(-)

diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm
index 20b30066a2..2edfc6bd64 100644
--- a/gnu/packages/kde-frameworks.scm
+++ b/gnu/packages/kde-frameworks.scm
@@ -1047,25 +1047,20 @@ protocols used in KDE Plasma.")
               (sha256
                (base32
                 "0dcnsiippwxvwvf1gvp75lx97c4nydzn3x1l8lfy86w9lfslw7zb"))))
-    (build-system cmake-build-system)
+    (build-system qt-build-system)
     (native-inputs
      (list extra-cmake-modules pkg-config))
     (inputs
      (list qtbase-5 plasma-wayland-protocols qtwayland-5 wayland 
wayland-protocols))
     (arguments
-     `(#:phases
-       (modify-phases %standard-phases
-         (add-after 'unpack 'skip-specific-tests
-           (lambda _
-             ;; PlasmaWindowModelTest::testChangeWindowAfterModelDestroy(icon)
-             (substitute* "autotests/client/test_plasma_window_model.cpp"
-               ((".*changedSpy\\.wait.*") ""))))
-         (replace 'check
-           (lambda* (#:key tests? #:allow-other-keys)
-             (setenv "XDG_RUNTIME_DIR" (getcwd))
-             (setenv "QT_QPA_PLATFORM" "offscreen")
-             (when tests? ;; One test fails.
-               (invoke "ctest" "-E" "kwayland-testWaylandRegistry")))))))
+     (list
+      ;; Tests spawn Wayland sessions that cannot run in parallel.
+      #:parallel-tests? #f
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-before 'check 'set-XDG_RUNTIME_DIR
+            (lambda _
+              (setenv "XDG_RUNTIME_DIR" (getcwd)))))))
     (home-page "https://community.kde.org/Frameworks";)
     (synopsis "Qt-style API to interact with the wayland client and server")
     (description "As the names suggest they implement a Client respectively a



reply via email to

[Prev in Thread] Current Thread [Next in Thread]