[gentoo-commits] repo/gentoo:master commit in: media-libs/x265/

[Alexis Ballier]

commit:     f384ec79e1ed374c864fc5d91f148c6754303ff8
Author:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 15 14:28:18 2015 +0000
Commit:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Thu Oct 15 14:28:32 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f384ec79

media-libs/x265: Make src_test more robust.

Build system builds "tests" only when asm optimizations are enabled, which may 
be disabled by other means (x32 or pic). Run tests only when it decided to 
build them.

Package-Manager: portage-2.2.23

 media-libs/x265/x265-1.8.ebuild  | 10 +++++-----
 media-libs/x265/x265-9999.ebuild | 10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/media-libs/x265/x265-1.8.ebuild b/media-libs/x265/x265-1.8.ebuild
index d5b67b2..1505f63 100644
--- a/media-libs/x265/x265-1.8.ebuild
+++ b/media-libs/x265/x265-1.8.ebuild
@@ -76,11 +76,11 @@ src_configure() {
 }
 
 multilib_src_test() {
-       if has ${MULTILIB_ABI_FLAG} abi_x86_32 abi_x86_64 ; then
-               cd "${BUILD_DIR}/test" || die
-               for i in TestBench ; do
-                       ./${i} || die
-               done
+       if [ -x "${BUILD_DIR}/test/TestBench" ] ; then
+               "${BUILD_DIR}/test/TestBench" || die
+       else
+               einfo "Unit tests check only assembly, and you do not seem to 
have any."
+               einfo "Skipping tests."
        fi
 }
 

diff --git a/media-libs/x265/x265-9999.ebuild b/media-libs/x265/x265-9999.ebuild
index 1298033..0d77b71 100644
--- a/media-libs/x265/x265-9999.ebuild
+++ b/media-libs/x265/x265-9999.ebuild
@@ -72,11 +72,11 @@ src_configure() {
 }
 
 multilib_src_test() {
-       if has ${MULTILIB_ABI_FLAG} abi_x86_32 abi_x86_64 ; then
-               cd "${BUILD_DIR}/test" || die
-               for i in TestBench ; do
-                       ./${i} || die
-               done
+       if [ -x "${BUILD_DIR}/test/TestBench" ] ; then
+               "${BUILD_DIR}/test/TestBench" || die
+       else
+               einfo "Unit tests check only assembly, and you do not seem to 
have any."
+               einfo "Skipping tests."
        fi
 }