From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59535) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dHu36-0003KJ-C4 for guix-patches@gnu.org; Mon, 05 Jun 2017 11:36:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dHu35-0001iJ-1a for guix-patches@gnu.org; Mon, 05 Jun 2017 11:36:08 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:55174) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dHu34-0001iE-UO for guix-patches@gnu.org; Mon, 05 Jun 2017 11:36:06 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1dHu34-0002AP-Nv for guix-patches@gnu.org; Mon, 05 Jun 2017 11:36:06 -0400 Subject: bug#27251: [PATCH 06/27] gnu: kde frameworks: Avoid requiring xorg-server for tests. Resent-Message-ID: From: Hartmut Goebel Date: Mon, 5 Jun 2017 17:34:57 +0200 Message-Id: <1496676918-6707-6-git-send-email-h.goebel@crazy-compilers.com> In-Reply-To: <1496676918-6707-1-git-send-email-h.goebel@crazy-compilers.com> References: <1496676918-6707-1-git-send-email-h.goebel@crazy-compilers.com> List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 27251@debbugs.gnu.org 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