From bae9829c7f88f645fe27f55641c1d6e67875e75f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= Date: Sun, 9 Oct 2022 16:15:43 +0100 Subject: [PATCH] Fix test and extra build, export make the diference with %ctest , also fix cmake macros changes arround 2020-07-29 --- opencv.spec | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/opencv.spec b/opencv.spec index 5e674c6..264b47b 100644 --- a/opencv.spec +++ b/opencv.spec @@ -388,12 +388,9 @@ ln -s -r %{buildroot}%{_jnidir}/opencv-%{javaver}.jar %{buildroot}%{_jnidir}/ope %check -# Check fails since we don't support most video -# read/write capability and we don't provide a display -# ARGS=-V increases output verbosity #ifnarch ppc64 %if %{with tests} - cp %SOURCE5 . + cp %SOURCE5 %{__cmake_builddir} if [ -x /usr/libexec/Xorg ]; then Xorg=/usr/libexec/Xorg else @@ -401,7 +398,8 @@ ln -s -r %{buildroot}%{_jnidir}/opencv-%{javaver}.jar %{buildroot}%{_jnidir}/ope fi $Xorg -noreset +extension GLX +extension RANDR +extension RENDER -logfile ./xorg.log -config ./xorg.conf -configdir . :99 & export DISPLAY=:99 - LD_LIBRARY_PATH=%{_builddir}/%{name}-%{version}/build/lib:$LD_LIBARY_PATH %ctest || : + export LD_LIBRARY_PATH=%{_builddir}/%{name}-%{version}/%{__cmake_builddir}/lib:$LD_LIBARY_PATH + %ctest || : %endif #endif