commit: cc91239fffd673154143d1841544dbef34c02b45 Author: Hans de Graaff <graaff <AT> gentoo <DOT> org> AuthorDate: Tue Jul 16 10:20:38 2019 +0000 Commit: Hans de Graaff <graaff <AT> gentoo <DOT> 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 <graaff <AT> 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
