From mboxrd@z Thu Jan 1 00:00:00 1970 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 Subject: [bug#33955] [PATCH 3/6] gnu: kpackage: Enable test-suite. Resent-Message-ID: From: Hartmut Goebel Date: Wed, 2 Jan 2019 19:46:47 +0100 Message-Id: <20190102184650.8075-3-h.goebel@crazy-compilers.com> In-Reply-To: <20190102184650.8075-1-h.goebel@crazy-compilers.com> References: <20190102184650.8075-1-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: 33955@debbugs.gnu.org * 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)) -- 2.13.7