Skip to content

Commit 611c358

Browse files
authored
5.x: Update videoio test filters for Win and OSX (#226)
1 parent d7b4882 commit 611c358

7 files changed

+10
-18
lines changed

.github/workflows/OCV-Contrib-PR-5.x-W10.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ env:
1919
SOURCE_BRANCH_NAME: ${{ github.head_ref }}
2020
TARGET_BRANCH_NAME: ${{ github.base_ref }}
2121
OPENCV_TEST_DATA_PATH: ${{ github.workspace }}\opencv_extra\testdata
22-
GTEST_FILTER_STRING: '-Samples.findFile:Drawing.ttf_text:videoio/videocapture_acceleration.read/122:videoio/videocapture_acceleration.read/126'
22+
GTEST_FILTER_STRING: '-Samples.findFile:Drawing.ttf_text:videoio/videocapture_acceleration.read/yuv420p_libvpxxvp9_mp4_MSMF_NONE_MAT'
2323
DOWNLOAD_DNN_MODELS_FILE: 'download_models.py'
2424

2525
jobs:

.github/workflows/OCV-Contrib-PR-5.x-macOS-ARM64.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ env:
2121
ANT_HOME: '/usr/share/ant'
2222
PYTHONPATH: '${{ github.workspace }}/build/python_loader:$PYTHONPATH'
2323
OPENCV_TEST_DATA_PATH: '${{ github.workspace }}/opencv_extra/testdata'
24-
GTEST_FILTER_STRING: '-GOTURN.memory_usage:DaSiamRPN.memory_usage:videoio_dynamic.basic_write:Tracking_Boosting.Boosting/0:Tracking_Boosting.Boosting/1:Tracking_Boosting.Boosting/2:Tracking_TLD.TLD/0:Tracking_TLD.TLD/1:Tracking_TLD.TLD/2:Tracking/DistanceAndOverlap.TLD/2:Tracking/DistanceAndOverlap.Scaled_Data_TLD/2:videoio/videocapture_acceleration.read/64:videoio/videocapture_acceleration.read/65:videoio/videocapture_acceleration.read/66:videoio/videocapture_acceleration.read/67'
24+
GTEST_FILTER_STRING: '-GOTURN.memory_usage:DaSiamRPN.memory_usage:videoio_dynamic.basic_write:Tracking_Boosting.Boosting/0:Tracking_Boosting.Boosting/1:Tracking_Boosting.Boosting/2:Tracking_TLD.TLD/0:Tracking_TLD.TLD/1:Tracking_TLD.TLD/2:Tracking/DistanceAndOverlap.TLD/2:Tracking/DistanceAndOverlap.Scaled_Data_TLD/2:videoio/videocapture_acceleration.read/yuv420p_libx265_mp4_FFMPEG_*'
2525

2626
jobs:
2727
BuildAndTest:

.github/workflows/OCV-PR-5.x-W10-Vulkan.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ env:
2121
PR_AUTHOR_FORK: ${{ github.event.pull_request.head.repo.full_name }}
2222
SOURCE_BRANCH_NAME: ${{ github.head_ref }}
2323
TARGET_BRANCH_NAME: ${{ github.base_ref }}
24-
GTEST_FILTER_STRING: '-Samples.findFile:videoio/videocapture_acceleration.read/122:videoio/videocapture_acceleration.read/126:Drawing.ttf_text'
24+
GTEST_FILTER_STRING: '-Samples.findFile:videoio/videocapture_acceleration.read/yuv420p_libvpxxvp9_mp4_MSMF_NONE_MAT:Drawing.ttf_text'
2525
DOWNLOAD_DNN_MODELS_FILE: 'download_models.py'
2626
OPENCV_VULKAN_RUNTIME: 'C:\VulkanSDK\1.3.239.0\Bin\vulkan-1.dll'
2727

.github/workflows/OCV-PR-5.x-W10.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ env:
2121
PR_AUTHOR_FORK: ${{ github.event.pull_request.head.repo.full_name }}
2222
SOURCE_BRANCH_NAME: ${{ github.head_ref }}
2323
TARGET_BRANCH_NAME: ${{ github.base_ref }}
24-
GTEST_FILTER_STRING: '-Samples.findFile:videoio/videocapture_acceleration.read/122:videoio/videocapture_acceleration.read/126:Drawing.ttf_text'
24+
GTEST_FILTER_STRING: '-Samples.findFile:videoio/videocapture_acceleration.read/yuv420p_libvpxxvp9_mp4_MSMF_NONE_MAT:Drawing.ttf_text'
2525
DOWNLOAD_DNN_MODELS_FILE: 'download_models.py'
2626

2727
jobs:

.github/workflows/OCV-PR-5.x-macOS-ARM64-Vulkan.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ env:
2323
OPENCV_TEST_DATA_PATH: '${{ github.workspace }}/opencv_extra/testdata'
2424
OPENCV_TEST_REQUIRE_DATA: 1
2525
OPENCV_TEST_CHECK_OPTIONAL_DATA: 1
26-
GTEST_FILTER_STRING: '-GOTURN.memory_usage:DaSiamRPN.memory_usage:videoio/videocapture_acceleration.read/64:videoio/videocapture_acceleration.read/65:videoio/videocapture_acceleration.read/66:videoio/videocapture_acceleration.read/67'
26+
GTEST_FILTER_STRING: '-GOTURN.memory_usage:DaSiamRPN.memory_usage:videoio/videocapture_acceleration.read/yuv420p_libx265_mp4_FFMPEG_*'
2727
OPENCV_VULKAN_RUNTIME: '/opt/VulkanSDK/1.3.239.0/MoltenVK/dylib/macOS/libMoltenVK.dylib'
2828

2929
jobs:

.github/workflows/OCV-PR-5.x-macOS-ARM64.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ env:
2323
OPENCV_TEST_DATA_PATH: '${{ github.workspace }}/opencv_extra/testdata'
2424
OPENCV_TEST_REQUIRE_DATA: 1
2525
OPENCV_TEST_CHECK_OPTIONAL_DATA: 1
26-
GTEST_FILTER_STRING: '-GOTURN.memory_usage:DaSiamRPN.memory_usage:videoio/videocapture_acceleration.read/64:videoio/videocapture_acceleration.read/65:videoio/videocapture_acceleration.read/66:videoio/videocapture_acceleration.read/67'
26+
GTEST_FILTER_STRING: '-GOTURN.memory_usage:DaSiamRPN.memory_usage:videoio/videocapture_acceleration.read/yuv420p_libx265_mp4_FFMPEG_*'
2727

2828
jobs:
2929
BuildAndTest:

scripts/test-plan-5.x.json

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -88,18 +88,10 @@
8888
"AsyncAPICancelation/cancel/*"
8989
],
9090
"test_videoio": [
91-
"videoio/videoio_synthetic.write_read_position/9",
92-
"videoio/videoio_synthetic.write_read_position/12",
93-
"videoio/videoio_synthetic.write_read_position/25",
94-
"videoio/videoio_synthetic.write_read_position/28",
95-
"videoio/videoio_synthetic.write_read_position/10",
96-
"videoio/videoio_synthetic.write_read_position/13",
97-
"videoio/videoio_synthetic.write_read_position/26",
98-
"videoio/videoio_synthetic.write_read_position/29",
99-
"videoio/videocapture_acceleration.read/24",
100-
"videoio/videocapture_acceleration.read/26",
101-
"videoio/videowriter_acceleration.write/40",
102-
"videoio/videowriter_acceleration.write/42"
91+
"videoio/videoio_synthetic.write_read_position/*_MPEG_GSTREAMER",
92+
"videoio/videoio_synthetic.write_read_position/*_MJPG_GSTREAMER",
93+
"videoio/videocapture_acceleration.read/yuv420p_mjpeg_mp4_GSTREAMER_*_MAT",
94+
"videoio/videowriter_acceleration.write/mkv_MPEG_GSTREAMER_*_MAT"
10395
]
10496
},
10597
"ubuntu-avx2": {

0 commit comments

Comments
 (0)