unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
From: Hartmut Goebel <h.goebel@crazy-compilers.com>
To: 27251@debbugs.gnu.org
Subject: bug#27251: [PATCH 06/27] gnu: kde frameworks: Avoid requiring xorg-server for tests.
Date: Mon,  5 Jun 2017 17:34:57 +0200	[thread overview]
Message-ID: <1496676918-6707-6-git-send-email-h.goebel@crazy-compilers.com> (raw)
In-Reply-To: <1496676918-6707-1-git-send-email-h.goebel@crazy-compilers.com>

Some packages started a x.org server for testing, which can be
avoided by setting QT_QPA_PLATFORM=offscreen.

* gnu/packages/kde-frameworks.scm (kitemmodels)
  [native-inputs]: Remove xorg-server.
  [arguments]<#phases> 'start-xorg-server' replace by 'check-setup'.
  (kplotting, kcrash, kimageformats): Likewise.
  (kitemviews)[native-inputs]: Remove xorg-server.
  [arguments]<#phases> 'start-xorg-server': Remove phase; 'check-setup':
  set QT_QPA_PLATFORM=offscreen.
---
 gnu/packages/kde-frameworks.scm | 64 +++++++++++++++--------------------------
 1 file changed, 23 insertions(+), 41 deletions(-)

diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm
index 4ecceb0..58f9ac0 100644
--- a/gnu/packages/kde-frameworks.scm
+++ b/gnu/packages/kde-frameworks.scm
@@ -748,20 +748,17 @@ or user activity.")
                 "1liq1ppa7xb1dcncv25c2a0xy3l9bvb2a56cff90c0b0vwr239q5"))))
     (build-system cmake-build-system)
     (native-inputs
-     `(("extra-cmake-modules" ,extra-cmake-modules)
-       ("xorg-server" ,xorg-server)))
+     `(("extra-cmake-modules" ,extra-cmake-modules)))
     (inputs
      `(("qtbase" ,qtbase)
        ("qtdeclarative" ,qtdeclarative)))
     (arguments
      `(#:phases
        (modify-phases %standard-phases
-         (add-before 'check 'start-xorg-server
-           (lambda* (#:key inputs #:allow-other-keys)
-             ;; The test suite requires a running X server.
-             (system (string-append (assoc-ref inputs "xorg-server")
-                                    "/bin/Xvfb :1 &"))
-             (setenv "DISPLAY" ":1")
+         (add-before 'check 'check-setup
+           (lambda _
+             ;; make Qt render "offscreen", required for tests
+             (setenv "QT_QPA_PLATFORM" "offscreen")
              #t)))))
     (home-page "https://community.kde.org/Frameworks")
     (synopsis "Set of item models extending the Qt model-view framework")
@@ -811,8 +808,7 @@ model to observers
     (build-system cmake-build-system)
     (native-inputs
      `(("extra-cmake-modules" ,extra-cmake-modules)
-       ("qttools" ,qttools)
-       ("xorg-server" ,xorg-server)))
+       ("qttools" ,qttools)))
     (inputs
      `(("qtbase" ,qtbase)))
     (arguments
@@ -821,13 +817,8 @@ model to observers
          (add-before 'check 'check-setup
            (lambda _
              (setenv "DBUS_FATAL_WARNINGS" "0")
-             #t))
-         (add-before 'check 'start-xorg-server
-           (lambda* (#:key inputs #:allow-other-keys)
-             ;; The test suite requires a running X server.
-             (system (string-append (assoc-ref inputs "xorg-server")
-                                    "/bin/Xvfb :1 &"))
-             (setenv "DISPLAY" ":1")
+             ;; make Qt render "offscreen", required for tests
+             (setenv "QT_QPA_PLATFORM" "offscreen")
              #t)))))
     (home-page "https://community.kde.org/Frameworks")
     (synopsis "Set of item views extending the Qt model-view framework")
@@ -851,19 +842,16 @@ to flat and hierarchical lists.")
                 "1ffy9b08128ym024wlfgnzk52vpy0mbaa91dhndpr40qcz0i67sh"))))
     (build-system cmake-build-system)
     (native-inputs
-     `(("extra-cmake-modules" ,extra-cmake-modules)
-       ("xorg-server" ,xorg-server)))
+     `(("extra-cmake-modules" ,extra-cmake-modules)))
     (inputs
      `(("qtbase" ,qtbase)))
     (arguments
      `(#:phases
        (modify-phases %standard-phases
-         (add-before 'check 'start-xorg-server
-           (lambda* (#:key inputs #:allow-other-keys)
-             ;; The test suite requires a running X server.
-             (system (string-append (assoc-ref inputs "xorg-server")
-                                    "/bin/Xvfb :1 &"))
-             (setenv "DISPLAY" ":1")
+         (add-before 'check 'check-setup
+           (lambda _ ; kplotting
+             ;; make Qt render "offscreen", required for tests
+             (setenv "QT_QPA_PLATFORM" "offscreen")
              #t)))))
     (home-page "https://community.kde.org/Frameworks")
     (synopsis "Data plotting library")
@@ -1342,8 +1330,7 @@ integrated it into your application's other widgets.")
                 "1cshay7dhbqgh62nq85vd9sm20gq9s9f70mdnzjjh1q7cajybkp3"))))
     (build-system cmake-build-system)
     (native-inputs
-     `(("extra-cmake-modules" ,extra-cmake-modules)
-       ("xorg-server" ,xorg-server)))
+     `(("extra-cmake-modules" ,extra-cmake-modules)))
     (inputs
      `(("kcoreaddons" ,kcoreaddons)
        ("kwindowsystem" ,kwindowsystem)
@@ -1352,12 +1339,10 @@ integrated it into your application's other widgets.")
     (arguments
      `(#:phases
        (modify-phases %standard-phases
-         (add-before 'check 'start-xorg-server
-           (lambda* (#:key inputs #:allow-other-keys)
-             ;; The test suite requires a running X server.
-             (system "Xvfb :1 &")
-             (sleep 2)              ;XXX: give the server enough time to start
-             (setenv "DISPLAY" ":1")
+         (add-before 'check 'check-setup
+           (lambda _
+             ;; make Qt render "offscreen", required for tests
+             (setenv "QT_QPA_PLATFORM" "offscreen")
              #t)))))
     (home-page "https://community.kde.org/Frameworks")
     (synopsis "Graceful handling of application crashes")
@@ -1480,19 +1465,16 @@ by applications to write metadata.")
                 "0q9ng4clqk2dqw43nk1pmq1d61rahc3qr4dmg4y3kjvz3ahnnijw"))))
     (build-system cmake-build-system)
     (native-inputs
-     `(("extra-cmake-modules" ,extra-cmake-modules)
-       ("xorg-server" ,xorg-server)))
+     `(("extra-cmake-modules" ,extra-cmake-modules)))
     (inputs
      `(("qtbase" ,qtbase)))
     (arguments
      `(#:phases
        (modify-phases %standard-phases
-         (add-before 'check 'start-xorg-server
-           (lambda* (#:key inputs #:allow-other-keys)
-             ;; The test suite requires a running X server.
-             (system (string-append (assoc-ref inputs "xorg-server")
-                                    "/bin/Xvfb :1 &"))
-             (setenv "DISPLAY" ":1")
+         (add-before 'check 'check-setup
+           (lambda _
+             ;; make Qt render "offscreen", required for tests
+             (setenv "QT_QPA_PLATFORM" "offscreen")
              #t)))))
     (home-page "https://community.kde.org/Frameworks")
     (synopsis "Plugins to allow QImage to support extra file formats")
-- 
2.7.4

  parent reply	other threads:[~2017-06-05 15:36 UTC|newest]

Thread overview: 31+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-06-05 11:53 bug#27251: [PATCH 00/27] KDE Frameworks: Add inputs, fix some tests, cleanup Hartmut Goebel
2017-06-05 15:34 ` bug#27251: [PATCH 01/27] gnu: kguiaddons: Add more optional inputs Hartmut Goebel
2017-06-05 15:34   ` bug#27251: [PATCH 02/27] gnu: kguiaddons: Remove unused native input Hartmut Goebel
2017-06-05 15:34   ` bug#27251: [PATCH 03/27] gnu: kguiaddons: Add a todo comment Hartmut Goebel
2017-06-05 15:34   ` bug#27251: [PATCH 04/27] gnu: kitemmodels: Add more optional inputs Hartmut Goebel
2017-06-05 15:34   ` bug#27251: [PATCH 05/27] gnu: kcompletion: Remove unused native input Hartmut Goebel
2017-06-05 15:34   ` Hartmut Goebel [this message]
2017-06-05 15:34   ` bug#27251: [PATCH 07/27] gnu: kimageformats: Add more optional and recommended inputs Hartmut Goebel
2017-06-05 15:34   ` bug#27251: [PATCH 08/27] gnu: kio: " Hartmut Goebel
2017-06-05 15:35   ` bug#27251: [PATCH 09/27] gnu: kinit: Add more optional inputs Hartmut Goebel
2017-06-05 15:35   ` bug#27251: [PATCH 10/27] gnu: ktexteditor: " Hartmut Goebel
2017-06-05 15:35   ` bug#27251: [PATCH 11/27] gnu: ktexteditor: Add a todo comment Hartmut Goebel
2017-06-05 15:35   ` bug#27251: [PATCH 12/27] gnu: plasma-framework: Add more optional inputs Hartmut Goebel
2017-06-05 15:35   ` bug#27251: [PATCH 13/27] gnu: plasma-framework: Update comment (number of failed tests) Hartmut Goebel
2017-06-05 15:35   ` bug#27251: [PATCH 14/27] gnu: kpackage: Add more optional inputs Hartmut Goebel
2017-06-05 15:35   ` bug#27251: [PATCH 15/27] gnu: kpackage: Update comment (number of failed tests) Hartmut Goebel
2017-06-05 15:35   ` bug#27251: [PATCH 16/27] gnu: sonnet: Add optional input (spell-checker) Hartmut Goebel
2017-06-05 15:35   ` bug#27251: [PATCH 17/27] gnu: gpgmepp: Superseded by gpgme Hartmut Goebel
2017-06-06 19:58     ` Marius Bakke
2017-06-05 15:35   ` bug#27251: [PATCH 18/27] gnu: kwallet: Use gpgme instead of gpgmepp Hartmut Goebel
2017-06-05 15:35   ` bug#27251: [PATCH 19/27] gnu: kiconthemes: Re-enable tests Hartmut Goebel
2017-06-05 15:35   ` bug#27251: [PATCH 20/27] gnu: kwidgetsaddons: " Hartmut Goebel
2017-06-05 15:35   ` bug#27251: [PATCH 21/27] gnu: kwindowsystem: Fix some test-cases (test-suite still disabled) Hartmut Goebel
2017-06-05 15:35   ` bug#27251: [PATCH 22/27] gnu: kdeclarative: Update comment Hartmut Goebel
2017-06-05 15:35   ` bug#27251: [PATCH 23/27] gnu: kpty: Add a todo comment Hartmut Goebel
2017-06-05 15:35   ` bug#27251: [PATCH 24/27] gnu: phonon: " Hartmut Goebel
2017-06-05 15:35   ` bug#27251: [PATCH 25/27] gnu: ktextwidgets: " Hartmut Goebel
2017-06-05 15:35   ` bug#27251: [PATCH 26/27] gnu: knotifications: Add a todo comments Hartmut Goebel
2017-06-05 15:35   ` bug#27251: [PATCH 27/27] gnu: solid: Add a todo comment Hartmut Goebel
2017-06-06 20:27 ` bug#27251: [PATCH 00/27] KDE Frameworks: Add inputs, fix some tests, cleanup Marius Bakke
2017-06-08 17:17   ` Hartmut Goebel

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://guix.gnu.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1496676918-6707-6-git-send-email-h.goebel@crazy-compilers.com \
    --to=h.goebel@crazy-compilers.com \
    --cc=27251@debbugs.gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).