From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:470:142:3::10]:33180) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hlffq-00061H-Mz for guix-patches@gnu.org; Thu, 11 Jul 2019 16:28:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hlffo-0006Da-UU for guix-patches@gnu.org; Thu, 11 Jul 2019 16:28:14 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:58188) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hlffo-0006D9-Ns for guix-patches@gnu.org; Thu, 11 Jul 2019 16:28:12 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hlffo-00070m-Fy for guix-patches@gnu.org; Thu, 11 Jul 2019 16:28:12 -0400 Subject: [bug#36605] [PATCH 3/6] gnu: kpackage: Enable test-suite. Resent-Message-ID: From: Hartmut Goebel Date: Thu, 11 Jul 2019 22:26:37 +0200 Message-Id: <20190711202644.32014-29-h.goebel@crazy-compilers.com> In-Reply-To: <20190711202644.32014-1-h.goebel@crazy-compilers.com> References: <58494E16.9010909@crazy-compilers.com> <20190711202644.32014-1-h.goebel@crazy-compilers.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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: 36605@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