Fix test and extra build, export make the diference with %ctest , also
fix cmake macros changes arround 2020-07-29
This commit is contained in:
parent
c2e1ca1d31
commit
bae9829c7f
@ -388,12 +388,9 @@ ln -s -r %{buildroot}%{_jnidir}/opencv-%{javaver}.jar %{buildroot}%{_jnidir}/ope
|
|||||||
|
|
||||||
|
|
||||||
%check
|
%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
|
#ifnarch ppc64
|
||||||
%if %{with tests}
|
%if %{with tests}
|
||||||
cp %SOURCE5 .
|
cp %SOURCE5 %{__cmake_builddir}
|
||||||
if [ -x /usr/libexec/Xorg ]; then
|
if [ -x /usr/libexec/Xorg ]; then
|
||||||
Xorg=/usr/libexec/Xorg
|
Xorg=/usr/libexec/Xorg
|
||||||
else
|
else
|
||||||
@ -401,7 +398,8 @@ ln -s -r %{buildroot}%{_jnidir}/opencv-%{javaver}.jar %{buildroot}%{_jnidir}/ope
|
|||||||
fi
|
fi
|
||||||
$Xorg -noreset +extension GLX +extension RANDR +extension RENDER -logfile ./xorg.log -config ./xorg.conf -configdir . :99 &
|
$Xorg -noreset +extension GLX +extension RANDR +extension RENDER -logfile ./xorg.log -config ./xorg.conf -configdir . :99 &
|
||||||
export DISPLAY=: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
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user