From patchwork Wed Jan 2 18:46:50 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Hartmut Goebel X-Patchwork-Id: 646 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 7BAF0169F6; Wed, 2 Jan 2019 18:48:18 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_HI, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mira.cbaines.net (Postfix) with ESMTP id 007BC169F4 for ; Wed, 2 Jan 2019 18:48:18 +0000 (GMT) Received: from localhost ([127.0.0.1]:46768 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gelYv-0006BO-JZ for patchwork@mira.cbaines.net; Wed, 02 Jan 2019 13:48:17 -0500 Received: from eggs.gnu.org ([208.118.235.92]:42891) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gelYl-00069m-8n for guix-patches@gnu.org; Wed, 02 Jan 2019 13:48:08 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gelYh-0001Ot-5N for guix-patches@gnu.org; Wed, 02 Jan 2019 13:48:07 -0500 Received: from debbugsout.gnu.org ([209.51.188.43]:54452) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gelYg-0001Oa-TB for guix-patches@gnu.org; Wed, 02 Jan 2019 13:48:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1gelYg-00089V-Bl for guix-patches@gnu.org; Wed, 02 Jan 2019 13:48:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#33955] [PATCH 6/6] gnu: kwindowsystem: Enable test-suite. Resent-From: Hartmut Goebel Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 02 Jan 2019 18:48:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 33955 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 33955@debbugs.gnu.org Received: via spool by 33955-submit@debbugs.gnu.org id=B33955.154645482831271 (code B ref 33955); Wed, 02 Jan 2019 18:48:02 +0000 Received: (at 33955) by debbugs.gnu.org; 2 Jan 2019 18:47:08 +0000 Received: from localhost ([127.0.0.1]:44997 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gelXi-00087X-66 for submit@debbugs.gnu.org; Wed, 02 Jan 2019 13:47:07 -0500 Received: from mail-out.m-online.net ([212.18.0.9]:47572) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gelXf-000877-SA for 33955@debbugs.gnu.org; Wed, 02 Jan 2019 13:47:00 -0500 Received: from frontend01.mail.m-online.net (unknown [192.168.8.182]) by mail-out.m-online.net (Postfix) with ESMTP id 43VKll15V0z1rMY8 for <33955@debbugs.gnu.org>; Wed, 2 Jan 2019 19:46:59 +0100 (CET) Received: from localhost (dynscan1.mnet-online.de [192.168.6.70]) by mail.m-online.net (Postfix) with ESMTP id 43VKll06Hcz1qvWY for <33955@debbugs.gnu.org>; Wed, 2 Jan 2019 19:46:59 +0100 (CET) X-Virus-Scanned: amavisd-new at mnet-online.de Received: from mail.mnet-online.de ([192.168.8.182]) by localhost (dynscan1.mail.m-online.net [192.168.6.70]) (amavisd-new, port 10024) with ESMTP id ZiJ4KSXSXLDx for <33955@debbugs.gnu.org>; Wed, 2 Jan 2019 19:46:57 +0100 (CET) Received: from hermia.goebel-consult.de (ppp-83-171-175-25.dynamic.mnet-online.de [83.171.175.25]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.mnet-online.de (Postfix) with ESMTPS for <33955@debbugs.gnu.org>; Wed, 2 Jan 2019 19:46:57 +0100 (CET) Received: from lenashee.goebel-consult.de (lenashee.goebel-consult.de [192.168.110.2]) by hermia.goebel-consult.de (Postfix) with ESMTP id A43BF60374 for <33955@debbugs.gnu.org>; Wed, 2 Jan 2019 19:49:45 +0100 (CET) From: Hartmut Goebel Date: Wed, 2 Jan 2019 19:46:50 +0100 Message-Id: <20190102184650.8075-6-h.goebel@crazy-compilers.com> X-Mailer: git-send-email 2.13.7 In-Reply-To: <20190102184650.8075-1-h.goebel@crazy-compilers.com> References: <20190102184650.8075-1-h.goebel@crazy-compilers.com> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/package/kde-frameworks.scm(kwindowsystem) [inputs]: Add openbox. [arguments] <#:tests?> Remove. <#:phases> 'blacklist-failing-tests: New phase. <#:phases> 'check: Start openbox, don't set QT_PLUGIN_PATH, use invkove, simplify and cleanup code. No longer move 'check behind install. --- gnu/packages/kde-frameworks.scm | 47 +++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 25 deletions(-) diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index 45580cb5f..72fd8f20f 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -1,7 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2015 Andreas Enge ;;; Copyright © 2016 Efraim Flashner -;;; Copyright © 2016,2017,2018 Hartmut Goebel +;;; Copyright © 2016-2019 Hartmut Goebel ;;; Copyright © 2016 David Craven ;;; Copyright © 2017 Thomas Danckaert ;;; Copyright © 2018 Tobias Geerinckx-Rice @@ -56,6 +56,7 @@ #:use-module (gnu packages libreoffice) #:use-module (gnu packages linux) #:use-module (gnu packages mp3) + #:use-module (gnu packages openbox) #:use-module (gnu packages pdf) #:use-module (gnu packages pcre) #:use-module (gnu packages perl) @@ -1093,6 +1094,7 @@ configuration pages, message boxes, and password requests.") `(("extra-cmake-modules" ,extra-cmake-modules) ("pkg-config" ,pkg-config) ("dbus" ,dbus) ; for the tests + ("openbox" ,openbox) ; for the tests ("qttools" ,qttools) ("xorg-server" ,xorg-server))) ; for the tests (inputs @@ -1101,31 +1103,26 @@ configuration pages, message boxes, and password requests.") ("qtx11extras" ,qtx11extras) ("xcb-utils-keysyms" ,xcb-util-keysyms))) (arguments - `(#:tests? #f ; FIXME: 3/12 tests fail. - #:phases + `(#:phases (modify-phases %standard-phases - (delete 'check) - (add-after 'install 'check - (lambda* (#:key inputs outputs tests? #:allow-other-keys) - ;; TODO: Simplify and use "common" phases when test-suite passes - (if tests? - (begin - (let ((out (assoc-ref outputs "out"))) - (setenv "QT_PLUGIN_PATH" - (string-append out "/lib/qt5/plugins:" - (getenv "QT_PLUGIN_PATH")))) - ;; The test suite requires a running X server, setting - ;; QT_QPA_PLATFORM=offscreen does not suffice and even make - ;; some tests fail. - (system (string-append (assoc-ref inputs "xorg-server") - "/bin/Xvfb :1 -screen 0 640x480x24 &")) - (setenv "DISPLAY" ":1") - (setenv "CTEST_OUTPUT_ON_FAILURE" "1") - (setenv "DBUS_FATAL_WARNINGS" "0") - (zero? (system* "dbus-launch" "ctest" "."))) - (begin - (format #t "test suite not run~%") - #t))))))) + (add-before 'check 'blacklist-failing-tests + (lambda _ + ;; Blacklist a failing test-functions. FIXME: Make it pass. + (with-output-to-file "autotests/BLACKLIST" + (lambda _ + (display "[testState]\n*\n") + (display "[testSupported]\n*\n"))) + #t)) + (replace 'check + (lambda _ + ;; The test suite requires a running window anager + (system "Xvfb :1 -ac -screen 0 640x480x24 &") + (setenv "DISPLAY" ":1") + (sleep 5) ;; Give Xvfb a few moments to get on it's feet + (system "openbox &") + (setenv "CTEST_OUTPUT_ON_FAILURE" "1") + (setenv "DBUS_FATAL_WARNINGS" "0") + (invoke "dbus-launch" "ctest" ".")))))) (home-page "https://community.kde.org/Frameworks") (synopsis "KDE access to the windowing system") (description "KWindowSystem provides information about and allows