[rpms/opencv] opencv5: - Run tests

[rpms/opencv] opencv5: - Run tests

[Orion Poplawski]

A new commit has been pushed.

Repo   : rpms/opencv
Branch : opencv5
Commit : 66ce8244e8135ba0acd69a3cd9e4e36c9daede7d
Author : Orion Poplawski <orion@nwra.com>
Date   : 2020-06-02T21:39:12-06:00
Stats  : +130/-5 in 4 file(s)
URL    : https://src.fedoraproject.org/rpms/opencv/c/66ce8244e8135ba0acd69a3cd9e4e36c9daede7d?branch=opencv5

Log:
- Run tests

---
diff --git a/opencv-clean.sh b/opencv-clean.sh
index e2c3564..2a29de3 100755
--- a/opencv-clean.sh
+++ b/opencv-clean.sh
@@ -2,17 +2,26 @@
 
 VERSION=4.3.0
 
+rm -rf opencv-${VERSION}/
 wget -c https://github.com/opencv/opencv/archive/${VERSION}/opencv-${VERSION}.tar.gz
 tar xf opencv-${VERSION}.tar.gz
 cd opencv-${VERSION}/
-find ./ -iname "len*.*" -exec rm {} \;
+find ./ -iname "len*.*" -exec rm {} +
 rm -rf modules/xfeatures2d/
 cd ..; tar zcf opencv-clean-${VERSION}.tar.gz opencv-${VERSION}/
 rm -rf opencv-${VERSION}/
 
+rm -rf opencv_contrib-${VERSION}/
 wget -c https://github.com/opencv/opencv_contrib/archive/${VERSION}/opencv_contrib-${VERSION}.tar.gz
 tar xf opencv_contrib-${VERSION}.tar.gz
 cd opencv_contrib-${VERSION}/
 rm -rf modules/xfeatures2d/
 cd ..; tar zcf opencv_contrib-clean-${VERSION}.tar.gz opencv_contrib-${VERSION}/
 rm -rf opencv_contrib-${VERSION}/
+
+rm -rf opencv_extra-${VERSION}/
+wget -c https://github.com/opencv/opencv_extra/archive/${VERSION}/opencv_extra-${VERSION}.tar.gz
+tar xf opencv_extra-${VERSION}.tar.gz
+find opencv_extra-${VERSION} \( -iname "len*.*" -o -iname "*lena*.png" -o -iname "*lena*.jpg" \) -exec rm {} +
+tar zcf opencv_extra-clean-${VERSION}.tar.gz opencv_extra-${VERSION}/
+rm -rf opencv_extra-${VERSION}/

diff --git a/opencv.spec b/opencv.spec
index 1ffe6b9..f7cd605 100644
--- a/opencv.spec
+++ b/opencv.spec
@@ -1,6 +1,6 @@
 #global indice   a
 %undefine _strict_symbol_defs_build
-%bcond_with     tests
+%bcond_without  tests
 %bcond_with     ffmpeg
 %bcond_without  gstreamer
 %bcond_with     eigen2
@@ -55,7 +55,7 @@
 
 Name:           opencv
 Version:        4.3.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Collection of algorithms for computer vision
 # This is normal three clause BSD.
 License:        BSD
@@ -67,8 +67,10 @@ URL:            https://opencv.org
 #
 Source0:        %{name}-clean-%{version}.tar.gz
 Source1:        %{name}_contrib-clean-%{version}.tar.gz
+Source2:        https://github.com/opencv/opencv_extra/archive/%{version}/opencv_extra-%{version}.tar.gz
 Source3:        face_landmark_model.dat.xz
 Source4:        b624b995ec9c439cbc2e9e6ee940d3a2-v0.1.1f.zip
+Source5:        xorg.conf
 
 Patch0:         opencv-4.1.0-install_3rdparty_licenses.patch
 Patch1:         https://patch-diff.githubusercontent.com/raw/opencv/opencv/pull/17431.patch
@@ -166,6 +168,10 @@ BuildRequires:  ant
 BuildRequires:  java-devel
 }
 %{?with_vulkan:BuildRequires:  vulkan-headers}
+%if %{with tests}
+BuildRequires:  xorg-x11-drv-dummy
+BuildRequires:  mesa-dri-drivers
+%endif
 
 Requires:       opencv-core%{_isa} = %{version}-%{release}
 
@@ -238,7 +244,7 @@ distribution, since the library maintains binary compatibility, and tries
 to provide decent performance and stability.
 
 %prep
-%setup -q -a1
+%setup -q -a1 -a2
 %if 1
 # we don't use pre-built contribs except quirc
 pushd 3rdparty
@@ -324,6 +330,7 @@ popd
  -DWITH_OPENMP=ON \
  -DOPENCV_CONFIG_INSTALL_PATH=%{_lib}/cmake/OpenCV \
  -DOPENCV_GENERATE_PKGCONFIG=ON \
+ -DOPENCV_TEST_DATA_PATH=opencv_extra-%{version}/testdata \
  %{?with_gdcm: -DWITH_GDCM=ON } \
  %{?with_libmfx: -DWITH_MFX=ON } \
  %{?with_clp: -DWITH_CLP=ON } \
@@ -356,10 +363,17 @@ ln -s -r %{buildroot}%{_jnidir}/opencv-%{javaver}.jar %{buildroot}%{_jnidir}/ope
 # Check fails since we don't support most video
 # read/write capability and we don't provide a display
 # ARGS=-V increases output verbosity
-# Make test is unavailble as of 2.3.1
 #ifnarch ppc64
 %if %{with tests}
 pushd build
+    cp %SOURCE5 .
+    if [ -x /usr/libexec/Xorg ]; then
+       Xorg=/usr/libexec/Xorg
+    else
+       Xorg=/usr/libexec/Xorg.bin
+    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 make test ARGS=-V || :
 popd
 %endif
@@ -468,6 +482,9 @@ popd
 %{_libdir}/libopencv_xphoto.so.%{abiver}*
 
 %changelog
+* Tue Jun 02 2020 Orion Poplawski <orion@nwra.com> - 4.3.0-3
+- Run tests
+
 * Tue Jun 02 2020 Orion Poplawski <orion@nwra.com> - 4.3.0-2
 - Add upstream patches for VTK 9.0 support (bz#1840977)
 

diff --git a/sources b/sources
index e50d2d3..09e268e 100644
--- a/sources
+++ b/sources
@@ -2,3 +2,4 @@ SHA512 (opencv-clean-4.3.0.tar.gz) = f582ffc45d1143abf62eac7d6ed416986e6aa0e26d9
 SHA512 (b624b995ec9c439cbc2e9e6ee940d3a2-v0.1.1f.zip) = f2994d5e92a2ae05cee6e153943afe151ce734ced6e06dcdb02dee9fed9336a7f1ea69661d9e033f1412fbb5e2a44a6e641662c85be5ba0604d0446abeabe836
 SHA512 (opencv_contrib-clean-4.3.0.tar.gz) = bc4f88f3624cf4aed237f8cf36ef62b20f31205e891948797e416faa5e1dd215d1bad85506aa4afacb5c11988a6fc3f81f282fd82fe491f5ffa070f97cc793d5
 SHA512 (face_landmark_model.dat.xz) = 7558f29431bb9cad1f22ee067ad3ed41be8f68b865992eb7d3a5ce6b6b9e1d031cb03e33c3c149220ef8faebd0471703a8a3bbb06402bcc8ce76bd28317aa307
+SHA512 (opencv_extra-clean-4.3.0.tar.gz) = 0f9f8b027ed7a105a6ed09d8953bb5d8c44a03ea99495aaf1dd4380a1488ca1acc614ad160a59080be4723469116d1213f3af6dfda0062d56f3575f6d2179bc4

diff --git a/xorg.conf b/xorg.conf
new file mode 100644
index 0000000..8edc240
--- /dev/null
+++ b/xorg.conf
@@ -0,0 +1,98 @@
+# This xorg configuration file is meant to be used
+# to start a dummy X11 server for graphical testing.
+
+Section "ServerFlags"
+  Option "DontVTSwitch" "true"
+  Option "AllowMouseOpenFail" "true"
+  Option "PciForceNone" "true"
+  Option "AutoEnableDevices" "false"
+  Option "AutoAddDevices" "false"
+EndSection
+
+Section "InputDevice"
+  Identifier "dummy_mouse"
+  Option "CorePointer" "true"
+  Driver "void"
+EndSection
+
+Section "InputDevice"
+  Identifier "dummy_keyboard"
+  Option "CoreKeyboard" "true"
+  Driver "void"
+EndSection
+
+Section "Device"
+  Identifier "dummy_videocard"
+  Driver "dummy"
+  Option "ConstantDPI" "true"
+  #VideoRam 4096000
+  #VideoRam 256000
+  VideoRam 192000
+EndSection
+
+Section "Monitor"
+  Identifier "dummy_monitor"
+  HorizSync   5.0 - 1000.0
+  VertRefresh 5.0 - 200.0
+  #This can be used to get a specific DPI, but only for the default resolution:
+  #DisplaySize 508 317
+  #NOTE: the highest modes will not work without increasing the VideoRam
+  # for the dummy video card.
+  Modeline "32768x32768" 15226.50 32768 35800 39488 46208 32768 32771 32781 32953
+  Modeline "32768x16384" 7516.25 32768 35544 39192 45616 16384 16387 16397 16478
+  Modeline "16384x8192" 2101.93 16384 16416 24400 24432 8192 8390 8403 8602
+  Modeline "8192x4096" 424.46 8192 8224 9832 9864 4096 4195 4202 4301
+  Modeline "5496x1200" 199.13 5496 5528 6280 6312 1200 1228 1233 1261
+  Modeline "5280x1080" 169.96 5280 5312 5952 5984 1080 1105 1110 1135
+  Modeline "5280x1200" 191.40 5280 5312 6032 6064 1200 1228 1233 1261
+  Modeline "5120x3200" 199.75 5120 5152 5904 5936 3200 3277 3283 3361
+  Modeline "4800x1200" 64.42 4800 4832 5072 5104 1200 1229 1231 1261
+  Modeline "3840x2880" 133.43 3840 3872 4376 4408 2880 2950 2955 3025
+  Modeline "3840x2560" 116.93 3840 3872 4312 4344 2560 2622 2627 2689
+  Modeline "3840x2048" 91.45 3840 3872 4216 4248 2048 2097 2101 2151
+  Modeline "3840x1080" 100.38 3840 3848 4216 4592 1080 1081 1084 1093
+  Modeline "3600x1200" 106.06 3600 3632 3984 4368 1200 1201 1204 1214
+  Modeline "3288x1080" 39.76 3288 3320 3464 3496 1080 1106 1108 1135
+  Modeline "2048x2048" 49.47 2048 2080 2264 2296 2048 2097 2101 2151
+  Modeline "2048x1536" 80.06 2048 2104 2312 2576 1536 1537 1540 1554
+  Modeline "2560x1600" 47.12 2560 2592 2768 2800 1600 1639 1642 1681
+  Modeline "2560x1440" 42.12 2560 2592 2752 2784 1440 1475 1478 1513
+  Modeline "1920x1440" 69.47 1920 1960 2152 2384 1440 1441 1444 1457
+  Modeline "1920x1200" 26.28 1920 1952 2048 2080 1200 1229 1231 1261
+  Modeline "1920x1080" 23.53 1920 1952 2040 2072 1080 1106 1108 1135
+  Modeline "1680x1050" 20.08 1680 1712 1784 1816 1050 1075 1077 1103
+  Modeline "1600x1200" 22.04 1600 1632 1712 1744 1200 1229 1231 1261
+  Modeline "1600x900" 33.92 1600 1632 1760 1792 900 921 924 946
+  Modeline "1440x900" 30.66 1440 1472 1584 1616 900 921 924 946
+  ModeLine "1366x768" 72.00 1366 1414 1446 1494  768 771 777 803
+  Modeline "1280x1024" 31.50 1280 1312 1424 1456 1024 1048 1052 1076
+  Modeline "1280x800" 24.15 1280 1312 1400 1432 800 819 822 841
+  Modeline "1280x768" 23.11 1280 1312 1392 1424 768 786 789 807
+  Modeline "1360x768" 24.49 1360 1392 1480 1512 768 786 789 807
+  Modeline "1024x768" 18.71 1024 1056 1120 1152 768 786 789 807
+  Modeline "768x1024" 19.50 768 800 872 904 1024 1048 1052 1076
+EndSection
+
+Section "Screen"
+  Identifier "dummy_screen"
+  Device "dummy_videocard"
+  Monitor "dummy_monitor"
+  DefaultDepth 24
+  SubSection "Display"
+    Viewport 0 0
+    Depth 24
+    #Modes "32768x32768" "32768x16384" "16384x8192" "8192x4096" "5120x3200" "3840x2880" "3840x2560" "3840x2048" "2048x2048" "2560x1600" "1920x1440" "1920x1200" "1920x1080" "1600x1200" "1680x1050" "1600x900" "1400x1050" "1440x900" "1280x1024" "1366x768" "1280x800" "1024x768"
+    Modes "5120x3200" "3840x2880" "3840x2560" "3840x2048" "2048x2048" "2560x1600" "1920x1440" "1920x1200" "1920x1080" "1600x1200" "1680x1050" "1600x900" "1400x1050" "1440x900" "1280x1024" "1366x768" "1280x800" "1024x768"
+    #Virtual 32000 32000
+    #Virtual 16384 8192
+    Virtual 8192 4096
+    #Virtual 5120 3200
+  EndSubSection
+EndSection
+
+Section "ServerLayout"
+  Identifier   "dummy_layout"
+  Screen       "dummy_screen"
+  InputDevice  "dummy_mouse"
+  InputDevice  "dummy_keyboard"
+EndSection