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
opencv · Jul 6, 2023 · a4755a6 · a4755a6
1 parent 620edca
commit a4755a6
Show file tree

Hide file tree

Showing 7 changed files with 2 additions and 24 deletions.
diff --git a/.github/workflows/OCV-Contrib-PR-5.x-ARM64.yaml b/.github/workflows/OCV-Contrib-PR-5.x-ARM64.yaml
@@ -139,10 +139,6 @@ jobs:
       timeout-minutes: 60
       if: ${{ always() && steps.build-opencv-contrib.outcome == 'success' }}
       run: cd $HOME/build && xvfb-run -a bin/opencv_test_aruco --gtest_filter=${{ env.GTEST_FILTER_STRING }} --test_threads=${{ env.PARALLEL_JOBS }}
-    - name: Accuracy:barcode
-      timeout-minutes: 60
-      if: ${{ always() && steps.build-opencv-contrib.outcome == 'success' }}
-      run: cd $HOME/build && xvfb-run -a bin/opencv_test_barcode --gtest_filter=${{ env.GTEST_FILTER_STRING }} --test_threads=${{ env.PARALLEL_JOBS }}
     - name: Accuracy:bgsegm
       timeout-minutes: 60
       if: ${{ always() && steps.build-opencv-contrib.outcome == 'success' }}

diff --git a/.github/workflows/OCV-Contrib-PR-5.x-U20.yaml b/.github/workflows/OCV-Contrib-PR-5.x-U20.yaml
@@ -139,10 +139,6 @@ jobs:
       timeout-minutes: 60
       if: ${{ always() && steps.build-opencv-contrib.outcome == 'success' }}
       run: cd $HOME/build && xvfb-run -a bin/opencv_test_aruco --test_threads=${{ env.PARALLEL_JOBS }}
-    - name: Accuracy:barcode
-      timeout-minutes: 60
-      if: ${{ always() && steps.build-opencv-contrib.outcome == 'success' }}
-      run: cd $HOME/build && xvfb-run -a bin/opencv_test_barcode --test_threads=${{ env.PARALLEL_JOBS }}
     - name: Accuracy:bgsegm
       timeout-minutes: 60
       if: ${{ always() && steps.build-opencv-contrib.outcome == 'success' }}

diff --git a/.github/workflows/OCV-Contrib-PR-5.x-W10.yaml b/.github/workflows/OCV-Contrib-PR-5.x-W10.yaml
@@ -135,10 +135,6 @@ jobs:
       timeout-minutes: 60
       if: ${{ always() && steps.build-opencv-contrib.outcome == 'success' }}
       run: cd ${{ github.workspace }}\build && bin\opencv_test_aruco.exe --skip_unstable --gtest_filter=${{ env.GTEST_FILTER_STRING }} --test_threads=%PARALLEL_JOBS%
-    - name: Accuracy:barcode
-      timeout-minutes: 60
-      if: ${{ always() && steps.build-opencv-contrib.outcome == 'success' }}
-      run: cd ${{ github.workspace }}\build && bin\opencv_test_barcode.exe --skip_unstable --gtest_filter=${{ env.GTEST_FILTER_STRING }} --test_threads=%PARALLEL_JOBS%
     - name: Accuracy:bgsegm
       timeout-minutes: 60
       if: ${{ always() && steps.build-opencv-contrib.outcome == 'success' }}

diff --git a/.github/workflows/OCV-Contrib-PR-5.x-macOS-ARM64.yaml b/.github/workflows/OCV-Contrib-PR-5.x-macOS-ARM64.yaml
@@ -132,11 +132,6 @@ jobs:
       if: ${{ always() && steps.build-opencv-contrib.outcome == 'success' }}
       run: ./bin/opencv_test_aruco --gtest_filter=${{ env.GTEST_FILTER_STRING }} --test_threads=$PARALLEL_JOBS
       working-directory: ${{ github.workspace }}/build
-    - name: Accuracy:barcode
-      timeout-minutes: 60
-      if: ${{ always() && steps.build-opencv-contrib.outcome == 'success' }}
-      run: ./bin/opencv_test_barcode --gtest_filter=${{ env.GTEST_FILTER_STRING }} --test_threads=$PARALLEL_JOBS
-      working-directory: ${{ github.workspace }}/build
     - name: Accuracy:bgsegm
       timeout-minutes: 60
       if: ${{ always() && steps.build-opencv-contrib.outcome == 'success' }}

diff --git a/.github/workflows/OCV-Contrib-PR-5.x-macOS-x86_64.yaml b/.github/workflows/OCV-Contrib-PR-5.x-macOS-x86_64.yaml
@@ -132,11 +132,6 @@ jobs:
       if: ${{ always() && steps.build-opencv-contrib.outcome == 'success' }}
       run: ./bin/opencv_test_aruco --gtest_filter=${{ env.GTEST_FILTER_STRING }} --test_threads=$PARALLEL_JOBS
       working-directory: ${{ github.workspace }}/build
-    - name: Accuracy:barcode
-      timeout-minutes: 60
-      if: ${{ always() && steps.build-opencv-contrib.outcome == 'success' }}
-      run: ./bin/opencv_test_barcode --gtest_filter=${{ env.GTEST_FILTER_STRING }} --test_threads=$PARALLEL_JOBS
-      working-directory: ${{ github.workspace }}/build
     - name: Accuracy:bgsegm
       timeout-minutes: 60
       if: ${{ always() && steps.build-opencv-contrib.outcome == 'success' }}

diff --git a/.github/workflows/OCV-PR-5.x-ARM64-Debug.yaml b/.github/workflows/OCV-PR-5.x-ARM64-Debug.yaml
@@ -144,7 +144,7 @@ jobs:
     - name: Accuracy:objdetect
       timeout-minutes: 60
       if: ${{ always() && steps.build-opencv.outcome == 'success' }}
-      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"
+      run: cd $HOME/build && xvfb-run -a bin/opencv_test_objdetect --test_threads=$PARALLEL_JOBS ${{ env.EXTRA_GTEST_OPTIONS }}
     - name: Accuracy:photo
       timeout-minutes: 60
       if: ${{ always() && steps.build-opencv.outcome == 'success' }}

diff --git a/.github/workflows/OCV-PR-5.x-ARM64.yaml b/.github/workflows/OCV-PR-5.x-ARM64.yaml
@@ -162,7 +162,7 @@ jobs:
     - name: Accuracy:objdetect
       timeout-minutes: 60
       if: ${{ always() && steps.build-opencv.outcome == 'success' }}
-      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"
+      run: cd $HOME/build && xvfb-run -a bin/opencv_test_objdetect --test_threads=$PARALLEL_JOBS ${{ env.EXTRA_GTEST_OPTIONS }}
     - name: Accuracy:photo
       timeout-minutes: 60
       if: ${{ always() && steps.build-opencv.outcome == 'success' }}