From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 4BB34138335 for ; Tue, 16 Jul 2019 10:21:11 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3B0CAE0826; Tue, 16 Jul 2019 10:21:10 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 20568E0826 for ; Tue, 16 Jul 2019 10:21:10 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id F296E347D55 for ; Tue, 16 Jul 2019 10:21:08 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id F3D926EA for ; Tue, 16 Jul 2019 10:21:06 +0000 (UTC) From: "Hans de Graaff" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Hans de Graaff" Message-ID: <1563272459.cc91239fffd673154143d1841544dbef34c02b45.graaff@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/poco/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-libs/poco/poco-1.9.0-r2.ebuild X-VCS-Directories: dev-libs/poco/ X-VCS-Committer: graaff X-VCS-Committer-Name: Hans de Graaff X-VCS-Revision: cc91239fffd673154143d1841544dbef34c02b45 X-VCS-Branch: master Date: Tue, 16 Jul 2019 10:21:06 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: cbc38073-276c-49df-ac3f-1f4e2c66bca5 X-Archives-Hash: 6156a725fd5196375a59597ee4feb72d commit: cc91239fffd673154143d1841544dbef34c02b45 Author: Hans de Graaff gentoo org> AuthorDate: Tue Jul 16 10:20:38 2019 +0000 Commit: Hans de Graaff gentoo org> CommitDate: Tue Jul 16 10:20:59 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cc91239f dev-libs/poco: fix tests - Redis tests require a running redis server - Crypto tests require the POCO_BASE env variable to be set Fixes: https://bugs.gentoo.org/682272 Signed-off-by: Hans de Graaff gentoo.org> Package-Manager: Portage-2.3.66, Repoman-2.3.11 dev-libs/poco/poco-1.9.0-r2.ebuild | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/dev-libs/poco/poco-1.9.0-r2.ebuild b/dev-libs/poco/poco-1.9.0-r2.ebuild index dabc308f3bb..151789c1733 100644 --- a/dev-libs/poco/poco-1.9.0-r2.ebuild +++ b/dev-libs/poco/poco-1.9.0-r2.ebuild @@ -54,7 +54,7 @@ src_prepare() { # and tests requiring running DB-servers, internet connections, etc. sed -i \ -e '/testsuite/d' \ - {Data/{MySQL,ODBC},MongoDB,Net,NetSSL_OpenSSL,PDF}/CMakeLists.txt || die + {Data/{MySQL,ODBC},MongoDB,Net,NetSSL_OpenSSL,PDF,Redis}/CMakeLists.txt || die # Poco expands ~ using passwd, which does not match $HOME in the build environment sed -i \ -e '/CppUnit_addTest.*testExpand/d' \ @@ -67,17 +67,20 @@ src_prepare() { fi if use mariadb ; then - # Fix MariaDB detection + # Fix MariaDB detection sed -i -e 's~/usr/include/mysql~~' \ -e 's/STATUS "Couldn/FATAL_ERROR "Couldn/' \ cmake/FindMySQL.cmake || die else - # Fix MySQL detection + # Fix MySQL detection sed -i -e 's/mysqlclient_r/mysqlclient/' \ -e 's/STATUS "Couldn/FATAL_ERROR "Couldn/' \ cmake/FindMySQL.cmake || die fi + # Add missing directory that breaks the build + mkdir -p Encodings/testsuite/data || die + cmake-utils_src_prepare } @@ -115,6 +118,10 @@ src_configure() { cmake-utils_src_configure } +src_test() { + POCO_BASE="${S}" cmake-utils_src_test +} + src_install() { cmake-utils_src_install