Run python tests from build folder to fix test search (#94)

Run python tests from build folder to use opencv_python_tests.cfg generated by build.
opencv · Apr 21, 2023 · dd412f2 · dd412f2
1 parent ce7e180
commit dd412f2
Show file tree

Hide file tree

Showing 35 changed files with 71 additions and 83 deletions.
diff --git a/.github/workflows/OCV-Contrib-PR-3.4-ARM64.yaml b/.github/workflows/OCV-Contrib-PR-3.4-ARM64.yaml
@@ -367,8 +367,8 @@ jobs:
       timeout-minutes: 60
       if: ${{ always() && steps.build-opencv-contrib.outcome == 'success' }}
       run: |
-        cd $HOME/opencv/modules/python/test
-        python3 ./test.py --repo $HOME/opencv -v
+        cd $HOME/build
+        python3 $HOME/opencv/modules/python/test/test.py --repo $HOME/opencv -v
     - name: Java
       timeout-minutes: 60
       id: java-test

diff --git a/.github/workflows/OCV-Contrib-PR-3.4-U14.yaml b/.github/workflows/OCV-Contrib-PR-3.4-U14.yaml
@@ -368,8 +368,8 @@ jobs:
       timeout-minutes: 60
       if: ${{ always() && steps.build-opencv-contrib.outcome == 'success' }}
       run: |
-        cd $HOME/opencv/modules/python/test
-        python3 ./test.py --repo $HOME/opencv -v
+        cd $HOME/build
+        python3 $HOME/opencv/modules/python/test/test.py --repo $HOME/opencv -v
     - name: Java
       timeout-minutes: 60
       id: java-test

diff --git a/.github/workflows/OCV-Contrib-PR-3.4-U20.yaml b/.github/workflows/OCV-Contrib-PR-3.4-U20.yaml
@@ -367,8 +367,8 @@ jobs:
       timeout-minutes: 60
       if: ${{ always() && steps.build-opencv-contrib.outcome == 'success' }}
       run: |
-        cd $HOME/opencv/modules/python/test
-        python3 ./test.py --repo $HOME/opencv -v
+        cd $HOME/build
+        python3 $HOME/opencv/modules/python/test/test.py --repo $HOME/opencv -v
     - name: Java
       timeout-minutes: 60
       id: java-test

diff --git a/.github/workflows/OCV-Contrib-PR-3.4-W10.yaml b/.github/workflows/OCV-Contrib-PR-3.4-W10.yaml
@@ -357,10 +357,10 @@ jobs:
       timeout-minutes: 60
       if: ${{ always() && steps.build-opencv-contrib.outcome == 'success' }}
       run: |
-        cd ${{ github.workspace }}\opencv\modules\python\test
+        cd ${{ github.workspace }}\build
         set PYTHONPATH=%PYTHONPATH%;${{ github.workspace }}\build\python_loader;${{ github.workspace }}\build\lib\python3
         set PATH=%PATH%;${{ github.workspace }}\build\bin;${{ github.workspace }}\build\lib\python3
-        python test.py --repo ${{ github.workspace }}\opencv -v
+        python ${{ github.workspace }}\opencv\modules\python\test\test.py --repo ${{ github.workspace }}\opencv -v
     - name: Java
       timeout-minutes: 60
       id: java-test

diff --git a/.github/workflows/OCV-Contrib-PR-3.4-macOS-ARM64.yaml b/.github/workflows/OCV-Contrib-PR-3.4-macOS-ARM64.yaml
@@ -417,9 +417,8 @@ jobs:
     - name: Python3
       timeout-minutes: 60
       if: ${{ always() && steps.build-opencv-contrib.outcome == 'success' }}
-      run: |
-        python3 ./test.py --repo ${{ github.workspace }}/opencv -v
-      working-directory: ${{ github.workspace }}/opencv/modules/python/test
+      run: python3 ../opencv/modules/python/test/test.py --repo ../opencv -v
+      working-directory: ${{ github.workspace }}/build
     - name: Java
       timeout-minutes: 60
       id: java-test

diff --git a/.github/workflows/OCV-Contrib-PR-3.4-macOS-x86_64.yaml b/.github/workflows/OCV-Contrib-PR-3.4-macOS-x86_64.yaml
@@ -417,9 +417,8 @@ jobs:
     - name: Python3
       timeout-minutes: 60
       if: ${{ always() && steps.build-opencv-contrib.outcome == 'success' }}
-      run: |
-        python3 ./test.py --repo ${{ github.workspace }}/opencv -v
-      working-directory: ${{ github.workspace }}/opencv/modules/python/test
+      run: python3 ../opencv/modules/python/test/test.py --repo ../opencv -v
+      working-directory: ${{ github.workspace }}/build
     - name: Java
       timeout-minutes: 60
       id: java-test

diff --git a/.github/workflows/OCV-Contrib-PR-4.x-ARM64.yaml b/.github/workflows/OCV-Contrib-PR-4.x-ARM64.yaml
@@ -421,8 +421,8 @@ jobs:
       timeout-minutes: 60
       if: ${{ always() && steps.build-opencv-contrib.outcome == 'success' }}
       run: |
-        cd $HOME/opencv/modules/python/test
-        python3 ./test.py --repo $HOME/opencv -v
+        cd $HOME/build
+        python3 $HOME/opencv/modules/python/test/test.py --repo $HOME/opencv -v
     - name: Java
       timeout-minutes: 60
       id: java-test

diff --git a/.github/workflows/OCV-Contrib-PR-4.x-U20.yaml b/.github/workflows/OCV-Contrib-PR-4.x-U20.yaml
@@ -429,8 +429,8 @@ jobs:
       timeout-minutes: 60
       if: ${{ always() && steps.build-opencv-contrib.outcome == 'success' }}
       run: |
-        cd $HOME/opencv/modules/python/test
-        python3 ./test.py --repo $HOME/opencv -v
+        cd $HOME/build
+        python3 $HOME/opencv/modules/python/test/test.py --repo $HOME/opencv -v
     - name: Java
       timeout-minutes: 60
       id: java-test

diff --git a/.github/workflows/OCV-Contrib-PR-4.x-W10.yaml b/.github/workflows/OCV-Contrib-PR-4.x-W10.yaml
@@ -415,10 +415,10 @@ jobs:
       timeout-minutes: 60
       if: ${{ always() && steps.build-opencv-contrib.outcome == 'success' }}
       run: |
-        cd ${{ github.workspace }}\opencv\modules\python\test
+        cd ${{ github.workspace }}\build
         set PYTHONPATH=%PYTHONPATH%;${{ github.workspace }}\build\python_loader;${{ github.workspace }}\build\lib\python3
         set PATH=%PATH%;${{ github.workspace }}\build\bin;${{ github.workspace }}\build\lib\python3
-        python test.py --repo ${{ github.workspace }}\opencv -v
+        python ${{ github.workspace }}\opencv\modules\python\test\test.py --repo ${{ github.workspace }}\opencv -v
     - name: Java
       timeout-minutes: 60
       id: java-test

diff --git a/.github/workflows/OCV-Contrib-PR-4.x-macOS-ARM64.yaml b/.github/workflows/OCV-Contrib-PR-4.x-macOS-ARM64.yaml
@@ -491,9 +491,8 @@ jobs:
     - name: Python3
       timeout-minutes: 60
       if: ${{ always() && steps.build-opencv-contrib.outcome == 'success' }}
-      run: |
-        python3 ./test.py --repo ${{ github.workspace }}/opencv -v
-      working-directory: ${{ github.workspace }}/opencv/modules/python/test
+      run: python3 ../opencv/modules/python/test/test.py --repo ../opencv -v
+      working-directory: ${{ github.workspace }}/build
     - name: Java
       timeout-minutes: 60
       id: java-test

diff --git a/.github/workflows/OCV-Contrib-PR-4.x-macOS-x86_64.yaml b/.github/workflows/OCV-Contrib-PR-4.x-macOS-x86_64.yaml
@@ -492,9 +492,8 @@ jobs:
     - name: Python3
       timeout-minutes: 60
       if: ${{ always() && steps.build-opencv-contrib.outcome == 'success' }}
-      run: |
-        python3 ./test.py --repo ${{ github.workspace }}/opencv -v
-      working-directory: ${{ github.workspace }}/opencv/modules/python/test
+      run: python3 ../opencv/modules/python/test/test.py --repo ../opencv -v
+      working-directory: ${{ github.workspace }}/build
     - name: Java
       timeout-minutes: 60
       id: java-test

diff --git a/.github/workflows/OCV-Contrib-PR-5.x-ARM64.yaml b/.github/workflows/OCV-Contrib-PR-5.x-ARM64.yaml
@@ -423,8 +423,8 @@ jobs:
       timeout-minutes: 60
       if: ${{ always() && steps.build-opencv-contrib.outcome == 'success' }}
       run: |
-        cd $HOME/opencv/modules/python/test
-        python3 ./test.py --repo $HOME/opencv -v
+        cd $HOME/build
+        python3 $HOME/opencv/modules/python/test/test.py --repo $HOME/opencv -v
     - name: Java
       timeout-minutes: 60
       id: java-test

diff --git a/.github/workflows/OCV-Contrib-PR-5.x-U20.yaml b/.github/workflows/OCV-Contrib-PR-5.x-U20.yaml
@@ -431,8 +431,8 @@ jobs:
       timeout-minutes: 60
       if: ${{ always() && steps.build-opencv-contrib.outcome == 'success' }}
       run: |
-        cd $HOME/opencv/modules/python/test
-        python3 ./test.py --repo $HOME/opencv -v
+        cd $HOME/build
+        python3 $HOME/opencv/modules/python/test/test.py --repo $HOME/opencv -v
     - name: Java
       timeout-minutes: 60
       id: java-test

diff --git a/.github/workflows/OCV-Contrib-PR-5.x-W10.yaml b/.github/workflows/OCV-Contrib-PR-5.x-W10.yaml
@@ -421,10 +421,10 @@ jobs:
       timeout-minutes: 60
       if: ${{ always() && steps.build-opencv-contrib.outcome == 'success' }}
       run: |
-        cd ${{ github.workspace }}\opencv\modules\python\test
+        cd ${{ github.workspace }}\build
         set PYTHONPATH=%PYTHONPATH%;${{ github.workspace }}\build\python_loader;${{ github.workspace }}\build\lib\python3
         set PATH=%PATH%;${{ github.workspace }}\build\bin;${{ github.workspace }}\build\lib\python3
-        python test.py --repo ${{ github.workspace }}\opencv -v
+        python ${{ github.workspace }}\opencv\modules\python\test\test.py --repo ${{ github.workspace }}\opencv -v
     - name: Java
       timeout-minutes: 60
       id: java-test

diff --git a/.github/workflows/OCV-Contrib-PR-5.x-macOS-ARM64.yaml b/.github/workflows/OCV-Contrib-PR-5.x-macOS-ARM64.yaml
@@ -495,9 +495,8 @@ jobs:
     - name: Python3
       timeout-minutes: 60
       if: ${{ always() && steps.build-opencv-contrib.outcome == 'success' }}
-      run: |
-        python3 ./test.py --repo ${{ github.workspace }}/opencv -v
-      working-directory: ${{ github.workspace }}/opencv/modules/python/test
+      run: python3 ../opencv/modules/python/test/test.py --repo ../opencv -v
+      working-directory: ${{ github.workspace }}/build
     - name: Java
       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
@@ -497,9 +497,8 @@ jobs:
     - name: Python3
       timeout-minutes: 60
       if: ${{ always() && steps.build-opencv-contrib.outcome == 'success' }}
-      run: |
-        python3 ./test.py --repo ${{ github.workspace }}/opencv -v
-      working-directory: ${{ github.workspace }}/opencv/modules/python/test
+      run: python3 ../opencv/modules/python/test/test.py --repo ../opencv -v
+      working-directory: ${{ github.workspace }}/build
     - name: Java
       timeout-minutes: 60
       id: java-test

diff --git a/.github/workflows/OCV-Coverage-4.x-U20.yaml b/.github/workflows/OCV-Coverage-4.x-U20.yaml
@@ -170,8 +170,8 @@ jobs:
       timeout-minutes: 60
       if: ${{ always() && steps.build-opencv.outcome == 'success' }}
       run: |
-        cd ${{ env.OPENCV_DOCKER_WORKDIR }}/modules/python/test
-        python3 ./test.py --repo ../../../ -v
+        cd /home/ci/build
+        python3 ${{ env.OPENCV_DOCKER_WORKDIR }}/modules/python/test/test.py --repo ${{ env.OPENCV_DOCKER_WORKDIR }} -v
     - name: Java
       timeout-minutes: 60
       id: java-test
@@ -295,4 +295,4 @@ jobs:
       if: ${{ always() && steps.coverage-perf-report.outcome == 'success' && steps.build-opencv.outcome == 'success' }}
       with:
         name: perf-coverage-html
-        path: /home/ci/build/perf_coverage_html
+        path: /home/ci/build/perf_coverage_html
diff --git a/.github/workflows/OCV-PR-3.4-ARM64.yaml b/.github/workflows/OCV-PR-3.4-ARM64.yaml
@@ -234,8 +234,8 @@ jobs:
       timeout-minutes: 60
       if: ${{ always() && steps.build-opencv.outcome == 'success' }}
       run: |
-        cd ${{ env.OPENCV_DOCKER_WORKDIR }}/modules/python/test
-        python3 ./test.py --repo ../../../ -v
+        cd $HOME/build
+        python3 $HOME/opencv/modules/python/test/test.py --repo $HOME/opencv -v
     - name: Java
       timeout-minutes: 60
       id: java-test

diff --git a/.github/workflows/OCV-PR-3.4-U14.yaml b/.github/workflows/OCV-PR-3.4-U14.yaml
@@ -236,8 +236,8 @@ jobs:
       timeout-minutes: 60
       if: ${{ always() && steps.build-opencv.outcome == 'success' }}
       run: |
-        cd ${{ env.OPENCV_DOCKER_WORKDIR }}/modules/python/test
-        python3 ./test.py --repo $HOME/opencv -v
+        cd $HOME/build
+        python3 $HOME/opencv/modules/python/test/test.py --repo $HOME/opencv -v
     - name: Java
       timeout-minutes: 60
       id: java-test

diff --git a/.github/workflows/OCV-PR-3.4-U20.yaml b/.github/workflows/OCV-PR-3.4-U20.yaml
@@ -235,8 +235,8 @@ jobs:
       timeout-minutes: 60
       if: ${{ always() && steps.build-opencv.outcome == 'success' }}
       run: |
-        cd ${{ env.OPENCV_DOCKER_WORKDIR }}/modules/python/test
-        python3 ./test.py --repo $HOME/opencv -v
+        cd $HOME/build
+        python3 $HOME/opencv/modules/python/test/test.py --repo $HOME/opencv -v
     - name: Java
       timeout-minutes: 60
       id: java-test

diff --git a/.github/workflows/OCV-PR-3.4-W10.yaml b/.github/workflows/OCV-PR-3.4-W10.yaml
@@ -233,10 +233,10 @@ jobs:
       timeout-minutes: 60
       if: ${{ always() && steps.build-opencv.outcome == 'success' }}
       run: |
-        cd ${{ github.workspace }}\opencv\modules\python\test
+        cd ${{ github.workspace }}\build
         set PYTHONPATH=%PYTHONPATH%;${{ github.workspace }}\build\python_loader;${{ github.workspace }}\build\lib\python3
         set PATH=%PATH%;${{ github.workspace }}\build\bin;${{ github.workspace }}\build\lib\python3
-        python test.py --repo ${{ github.workspace }}\opencv -v
+        python ${{ github.workspace }}\opencv\modules\python\test\test.py --repo ${{ github.workspace }}\opencv -v
     - name: Java
       timeout-minutes: 60
       id: java-test

diff --git a/.github/workflows/OCV-PR-3.4-macOS-ARM64.yaml b/.github/workflows/OCV-PR-3.4-macOS-ARM64.yaml
@@ -255,9 +255,8 @@ jobs:
     - name: Python3
       timeout-minutes: 60
       if: ${{ always() && steps.build-opencv.outcome == 'success' }}
-      run: |
-        python3 ./test.py --repo ${{ github.workspace }}/opencv -v
-      working-directory: ${{ github.workspace }}/opencv/modules/python/test
+      run: python3 ../opencv/modules/python/test/test.py --repo ../opencv -v
+      working-directory: ${{ github.workspace }}/build
     - name: Java
       timeout-minutes: 60
       id: java-test

diff --git a/.github/workflows/OCV-PR-3.4-macOS-x86_64.yaml b/.github/workflows/OCV-PR-3.4-macOS-x86_64.yaml
@@ -255,9 +255,8 @@ jobs:
     - name: Python3
       timeout-minutes: 60
       if: ${{ always() && steps.build-opencv.outcome == 'success' }}
-      run: |
-        python3 ./test.py --repo ${{ github.workspace }}/opencv -v
-      working-directory: ${{ github.workspace }}/opencv/modules/python/test
+      run: python3 ../opencv/modules/python/test/test.py --repo ../opencv -v
+      working-directory: ${{ github.workspace }}/build
     - name: Java
       timeout-minutes: 60
       id: java-test

diff --git a/.github/workflows/OCV-PR-4.x-ARM64-Debug.yaml b/.github/workflows/OCV-PR-4.x-ARM64-Debug.yaml
@@ -161,8 +161,8 @@ jobs:
       timeout-minutes: 60
       if: ${{ always() && steps.build-opencv.outcome == 'success' }}
       run: |
-        cd ${{ env.OPENCV_DOCKER_WORKDIR }}/modules/python/test
-        python3 ./test.py --repo $HOME/opencv -v
+        cd $HOME/build
+        python3 $HOME/opencv/modules/python/test/test.py --repo $HOME/opencv -v
     - name: Java
       timeout-minutes: 60
       id: java-test

diff --git a/.github/workflows/OCV-PR-4.x-ARM64.yaml b/.github/workflows/OCV-PR-4.x-ARM64.yaml
@@ -223,8 +223,8 @@ jobs:
       timeout-minutes: 60
       if: ${{ always() && steps.build-opencv.outcome == 'success' }}
       run: |
-        cd ${{ env.OPENCV_DOCKER_WORKDIR }}/modules/python/test
-        python3 ./test.py --repo $HOME/opencv -v
+        cd $HOME/build
+        python3 $HOME/opencv/modules/python/test/test.py --repo $HOME/opencv -v
     - name: Java
       timeout-minutes: 60
       id: java-test

diff --git a/.github/workflows/OCV-PR-4.x-U20.yaml b/.github/workflows/OCV-PR-4.x-U20.yaml
@@ -232,8 +232,8 @@ jobs:
       timeout-minutes: 60
       if: ${{ always() && steps.build-opencv.outcome == 'success' }}
       run: |
-        cd ${{ env.OPENCV_DOCKER_WORKDIR }}/modules/python/test
-        python3 ./test.py --repo $HOME/opencv -v
+        cd $HOME/build
+        python3 $HOME/opencv/modules/python/test/test.py --repo $HOME/opencv -v
     - name: Java
       timeout-minutes: 60
       id: java-test

diff --git a/.github/workflows/OCV-PR-4.x-W10.yaml b/.github/workflows/OCV-PR-4.x-W10.yaml
@@ -225,10 +225,10 @@ jobs:
       timeout-minutes: 60
       if: ${{ always() && steps.build-opencv.outcome == 'success' }}
       run: |
-        cd ${{ github.workspace }}\opencv\modules\python\test
+        cd ${{ github.workspace }}\build
         set PYTHONPATH=%PYTHONPATH%;${{ github.workspace }}\build\python_loader;${{ github.workspace }}\build\lib\python3
         set PATH=%PATH%;${{ github.workspace }}\build\bin;${{ github.workspace }}\build\lib\python3
-        python test.py --repo ${{ github.workspace }}\opencv -v
+        python ${{ github.workspace }}\opencv\modules\python\test\test.py --repo ${{ github.workspace }}\opencv -v
     - name: Java
       timeout-minutes: 60
       id: java-test

diff --git a/.github/workflows/OCV-PR-4.x-macOS-ARM64.yaml b/.github/workflows/OCV-PR-4.x-macOS-ARM64.yaml
@@ -249,9 +249,8 @@ jobs:
     - name: Python3
       timeout-minutes: 60
       if: ${{ always() && steps.build-opencv.outcome == 'success' }}
-      run: |
-        python3 ./test.py --repo ${{ github.workspace }}/opencv -v
-      working-directory: ${{ github.workspace }}/opencv/modules/python/test
+      run: python3 ../opencv/modules/python/test/test.py --repo ../opencv -v
+      working-directory: ${{ github.workspace }}/build
     - name: Java
       timeout-minutes: 60
       id: java-test

diff --git a/.github/workflows/OCV-PR-4.x-macOS-x86_64.yaml b/.github/workflows/OCV-PR-4.x-macOS-x86_64.yaml
@@ -250,9 +250,8 @@ jobs:
     - name: Python3
       timeout-minutes: 60
       if: ${{ always() && steps.build-opencv.outcome == 'success' }}
-      run: |
-        python3 ./test.py --repo ${{ github.workspace }}/opencv -v
-      working-directory: ${{ github.workspace }}/opencv/modules/python/test
+      run: python3 ../opencv/modules/python/test/test.py --repo ../opencv -v
+      working-directory: ${{ github.workspace }}/build
     - name: Java
       timeout-minutes: 60
       id: java-test

diff --git a/.github/workflows/OCV-PR-5.x-ARM64-Debug.yaml b/.github/workflows/OCV-PR-5.x-ARM64-Debug.yaml
@@ -169,8 +169,8 @@ jobs:
       timeout-minutes: 60
       if: ${{ always() && steps.build-opencv.outcome == 'success' }}
       run: |
-        cd ${{ env.OPENCV_DOCKER_WORKDIR }}/modules/python/test
-        python3 ./test.py --repo $HOME/opencv -v
+        cd $HOME/build
+        python3 $HOME/opencv/modules/python/test/test.py --repo $HOME/opencv -v
     - name: Java
       timeout-minutes: 60
       id: java-test

diff --git a/.github/workflows/OCV-PR-5.x-ARM64.yaml b/.github/workflows/OCV-PR-5.x-ARM64.yaml
@@ -239,8 +239,8 @@ jobs:
       timeout-minutes: 60
       if: ${{ always() && steps.build-opencv.outcome == 'success' }}
       run: |
-        cd ${{ env.OPENCV_DOCKER_WORKDIR }}/modules/python/test
-        python3 ./test.py --repo $HOME/opencv -v
+        cd $HOME/build
+        python3 $HOME/opencv/modules/python/test/test.py --repo $HOME/opencv -v
     - name: Java
       timeout-minutes: 60
       id: java-test

diff --git a/.github/workflows/OCV-PR-5.x-U20.yaml b/.github/workflows/OCV-PR-5.x-U20.yaml
@@ -246,8 +246,8 @@ jobs:
       timeout-minutes: 60
       if: ${{ always() && steps.build-opencv.outcome == 'success' }}
       run: |
-        cd ${{ env.OPENCV_DOCKER_WORKDIR }}/modules/python/test
-        python3 ./test.py --repo $HOME/opencv -v
+        cd $HOME/build
+        python3 $HOME/opencv/modules/python/test/test.py --repo $HOME/opencv -v
     - name: Java
       timeout-minutes: 60
       id: java-test

diff --git a/.github/workflows/OCV-PR-5.x-W10.yaml b/.github/workflows/OCV-PR-5.x-W10.yaml
@@ -241,10 +241,10 @@ jobs:
       timeout-minutes: 60
       if: ${{ always() && steps.build-opencv.outcome == 'success' }}
       run: |
-        cd ${{ github.workspace }}\opencv\modules\python\test
+        cd ${{ github.workspace }}\build
         set PYTHONPATH=%PYTHONPATH%;${{ github.workspace }}\build\python_loader;${{ github.workspace }}\build\lib\python3
         set PATH=%PATH%;${{ github.workspace }}\build\bin;${{ github.workspace }}\build\lib\python3
-        python test.py --repo ${{ github.workspace }}\opencv -v
+        python ${{ github.workspace }}\opencv\modules\python\test\test.py --repo ${{ github.workspace }}\opencv -v
     - name: Java
       timeout-minutes: 60
       id: java-test