Skip to content

Commit a4755a6

Browse files
authored
Sync 4.x and 5.x after branches merge (#105)
Related PR in main repo: opencv/opencv#23718 - Removed barcode module tests as it was migrated to objdetect - Removed QR code test blacklist
1 parent 620edca commit a4755a6

7 files changed

+2
-24
lines changed

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -139,10 +139,6 @@ jobs:
139139
timeout-minutes: 60
140140
if: ${{ always() && steps.build-opencv-contrib.outcome == 'success' }}
141141
run: cd $HOME/build && xvfb-run -a bin/opencv_test_aruco --gtest_filter=${{ env.GTEST_FILTER_STRING }} --test_threads=${{ env.PARALLEL_JOBS }}
142-
- name: Accuracy:barcode
143-
timeout-minutes: 60
144-
if: ${{ always() && steps.build-opencv-contrib.outcome == 'success' }}
145-
run: cd $HOME/build && xvfb-run -a bin/opencv_test_barcode --gtest_filter=${{ env.GTEST_FILTER_STRING }} --test_threads=${{ env.PARALLEL_JOBS }}
146142
- name: Accuracy:bgsegm
147143
timeout-minutes: 60
148144
if: ${{ always() && steps.build-opencv-contrib.outcome == 'success' }}

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -139,10 +139,6 @@ jobs:
139139
timeout-minutes: 60
140140
if: ${{ always() && steps.build-opencv-contrib.outcome == 'success' }}
141141
run: cd $HOME/build && xvfb-run -a bin/opencv_test_aruco --test_threads=${{ env.PARALLEL_JOBS }}
142-
- name: Accuracy:barcode
143-
timeout-minutes: 60
144-
if: ${{ always() && steps.build-opencv-contrib.outcome == 'success' }}
145-
run: cd $HOME/build && xvfb-run -a bin/opencv_test_barcode --test_threads=${{ env.PARALLEL_JOBS }}
146142
- name: Accuracy:bgsegm
147143
timeout-minutes: 60
148144
if: ${{ always() && steps.build-opencv-contrib.outcome == 'success' }}

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -135,10 +135,6 @@ jobs:
135135
timeout-minutes: 60
136136
if: ${{ always() && steps.build-opencv-contrib.outcome == 'success' }}
137137
run: cd ${{ github.workspace }}\build && bin\opencv_test_aruco.exe --skip_unstable --gtest_filter=${{ env.GTEST_FILTER_STRING }} --test_threads=%PARALLEL_JOBS%
138-
- name: Accuracy:barcode
139-
timeout-minutes: 60
140-
if: ${{ always() && steps.build-opencv-contrib.outcome == 'success' }}
141-
run: cd ${{ github.workspace }}\build && bin\opencv_test_barcode.exe --skip_unstable --gtest_filter=${{ env.GTEST_FILTER_STRING }} --test_threads=%PARALLEL_JOBS%
142138
- name: Accuracy:bgsegm
143139
timeout-minutes: 60
144140
if: ${{ always() && steps.build-opencv-contrib.outcome == 'success' }}

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -132,11 +132,6 @@ jobs:
132132
if: ${{ always() && steps.build-opencv-contrib.outcome == 'success' }}
133133
run: ./bin/opencv_test_aruco --gtest_filter=${{ env.GTEST_FILTER_STRING }} --test_threads=$PARALLEL_JOBS
134134
working-directory: ${{ github.workspace }}/build
135-
- name: Accuracy:barcode
136-
timeout-minutes: 60
137-
if: ${{ always() && steps.build-opencv-contrib.outcome == 'success' }}
138-
run: ./bin/opencv_test_barcode --gtest_filter=${{ env.GTEST_FILTER_STRING }} --test_threads=$PARALLEL_JOBS
139-
working-directory: ${{ github.workspace }}/build
140135
- name: Accuracy:bgsegm
141136
timeout-minutes: 60
142137
if: ${{ always() && steps.build-opencv-contrib.outcome == 'success' }}

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -132,11 +132,6 @@ jobs:
132132
if: ${{ always() && steps.build-opencv-contrib.outcome == 'success' }}
133133
run: ./bin/opencv_test_aruco --gtest_filter=${{ env.GTEST_FILTER_STRING }} --test_threads=$PARALLEL_JOBS
134134
working-directory: ${{ github.workspace }}/build
135-
- name: Accuracy:barcode
136-
timeout-minutes: 60
137-
if: ${{ always() && steps.build-opencv-contrib.outcome == 'success' }}
138-
run: ./bin/opencv_test_barcode --gtest_filter=${{ env.GTEST_FILTER_STRING }} --test_threads=$PARALLEL_JOBS
139-
working-directory: ${{ github.workspace }}/build
140135
- name: Accuracy:bgsegm
141136
timeout-minutes: 60
142137
if: ${{ always() && steps.build-opencv-contrib.outcome == 'success' }}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ jobs:
144144
- name: Accuracy:objdetect
145145
timeout-minutes: 60
146146
if: ${{ always() && steps.build-opencv.outcome == 'success' }}
147-
run: cd $HOME/build && xvfb-run -a bin/opencv_test_objdetect --test_threads=$PARALLEL_JOBS ${{ env.EXTRA_GTEST_OPTIONS }} --gtest_filter="-Objdetect_QRCode_Close.regression/0:Objdetect_QRCode_Close.regression/4"
147+
run: cd $HOME/build && xvfb-run -a bin/opencv_test_objdetect --test_threads=$PARALLEL_JOBS ${{ env.EXTRA_GTEST_OPTIONS }}
148148
- name: Accuracy:photo
149149
timeout-minutes: 60
150150
if: ${{ always() && steps.build-opencv.outcome == 'success' }}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ jobs:
162162
- name: Accuracy:objdetect
163163
timeout-minutes: 60
164164
if: ${{ always() && steps.build-opencv.outcome == 'success' }}
165-
run: cd $HOME/build && xvfb-run -a bin/opencv_test_objdetect --test_threads=$PARALLEL_JOBS ${{ env.EXTRA_GTEST_OPTIONS }} --gtest_filter="-Objdetect_QRCode_Close.regression/0:Objdetect_QRCode_Close.regression/4"
165+
run: cd $HOME/build && xvfb-run -a bin/opencv_test_objdetect --test_threads=$PARALLEL_JOBS ${{ env.EXTRA_GTEST_OPTIONS }}
166166
- name: Accuracy:photo
167167
timeout-minutes: 60
168168
if: ${{ always() && steps.build-opencv.outcome == 'success' }}

0 commit comments

Comments
 (0)