From patchwork Wed Jan 2 18:46:47 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hartmut Goebel X-Patchwork-Id: 644 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 2091E169F6; Wed, 2 Jan 2019 18:47:35 +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=-1.9 required=5.0 tests=BAYES_00 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from listsout.gnu.org (listsout.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id D1CD4169F4 for ; Wed, 2 Jan 2019 18:47:34 +0000 (GMT) Received: from localhost ([127.0.0.1]:46762 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gelYE-0005yw-GO for patchwork@mira.cbaines.net; Wed, 02 Jan 2019 13:47:34 -0500 Received: from eggs.gnu.org ([208.118.235.92]:42639) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gelXv-0005lw-EL for guix-patches@gnu.org; Wed, 02 Jan 2019 13:47:16 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gelXn-0000FS-OY for guix-patches@gnu.org; Wed, 02 Jan 2019 13:47:11 -0500 Received: from debbugs.gnu.org ([208.118.235.43]:33053) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gelXj-0000CA-4r for guix-patches@gnu.org; Wed, 02 Jan 2019 13:47:05 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1gelXj-00087j-2J for guix-patches@gnu.org; Wed, 02 Jan 2019 13:47:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#33955] [PATCH 3/6] gnu: kpackage: Enable test-suite. Resent-From: Hartmut Goebel Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 02 Jan 2019 18:47:03 +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.154645481631173 (code B ref 33955); Wed, 02 Jan 2019 18:47:03 +0000 Received: (at 33955) by debbugs.gnu.org; 2 Jan 2019 18:46:56 +0000 Received: from localhost ([127.0.0.1]:44989 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gelXc-00086Z-7R for submit@debbugs.gnu.org; Wed, 02 Jan 2019 13:46:56 -0500 Received: from mail-out.m-online.net ([212.18.0.10]:46761) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gelXa-00086H-SA for 33955@debbugs.gnu.org; Wed, 02 Jan 2019 13:46:55 -0500 Received: from frontend01.mail.m-online.net (unknown [192.168.8.182]) by mail-out.m-online.net (Postfix) with ESMTP id 43VKlf2GMfz1s31X for <33955@debbugs.gnu.org>; Wed, 2 Jan 2019 19:46:54 +0100 (CET) Received: from localhost (dynscan1.mnet-online.de [192.168.6.70]) by mail.m-online.net (Postfix) with ESMTP id 43VKlf29QMz1qqlC for <33955@debbugs.gnu.org>; Wed, 2 Jan 2019 19:46:54 +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 R3w0Ac0xwbUT for <33955@debbugs.gnu.org>; Wed, 2 Jan 2019 19:46:53 +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:53 +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 6A7986029B for <33955@debbugs.gnu.org>; Wed, 2 Jan 2019 19:49:45 +0100 (CET) From: Hartmut Goebel Date: Wed, 2 Jan 2019 19:46:47 +0100 Message-Id: <20190102184650.8075-3-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> 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] X-Received-From: 208.118.235.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(kpackage)[arguments] <#:tests?>: Remove. <#:phases>: Add phase 'patch-tests. --- gnu/packages/kde-frameworks.scm | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index 62cf49c57..07e30d4cf 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -1834,8 +1834,7 @@ covers feedback and persistent events.") ("ki18n" ,ki18n) ("qtbase" ,qtbase))) (arguments - `(#:tests? #f ; FIXME: 3/9 tests fail. - #:phases + `(#:phases (modify-phases %standard-phases (add-after 'unpack 'patch (lambda _ @@ -1847,6 +1846,17 @@ covers feedback and persistent events.") (("^\\s*(QDirIterator it\\(.*, QDirIterator::Subdirectories)(\\);)" _ a b) (string-append a " | QDirIterator::FollowSymlinks" b))) #t)) + (add-after 'unpack 'patch-tests + (lambda _ + ;; /bin/ls doesn't exist in the build-container use /etc/passwd + (substitute* "autotests/packagestructuretest.cpp" + (("(addDirectoryDefinition\\(\")bin(\".*\")bin(\".*\")bin\"" + _ a b c) + (string-append a "etc" b "etc" c "etc\"")) + (("filePath\\(\"bin\", QStringLiteral\\(\"ls\"))") + "filePath(\"etc\", QStringLiteral(\"passwd\"))") + (("\"/bin/ls\"") "\"/etc/passwd\"")) + #t)) (add-before 'check 'check-setup (lambda _ (setenv "HOME" (getcwd))