From dd412f21e3f8bc8ca1b58de72f6d6c824b58d9de Mon Sep 17 00:00:00 2001 From: Alexander Smorkalov <2536374+asmorkalov@users.noreply.github.com> Date: Fri, 21 Apr 2023 09:27:05 +0300 Subject: [PATCH] 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. --- .github/workflows/OCV-Contrib-PR-3.4-ARM64.yaml | 4 ++-- .github/workflows/OCV-Contrib-PR-3.4-U14.yaml | 4 ++-- .github/workflows/OCV-Contrib-PR-3.4-U20.yaml | 4 ++-- .github/workflows/OCV-Contrib-PR-3.4-W10.yaml | 4 ++-- .github/workflows/OCV-Contrib-PR-3.4-macOS-ARM64.yaml | 5 ++--- .github/workflows/OCV-Contrib-PR-3.4-macOS-x86_64.yaml | 5 ++--- .github/workflows/OCV-Contrib-PR-4.x-ARM64.yaml | 4 ++-- .github/workflows/OCV-Contrib-PR-4.x-U20.yaml | 4 ++-- .github/workflows/OCV-Contrib-PR-4.x-W10.yaml | 4 ++-- .github/workflows/OCV-Contrib-PR-4.x-macOS-ARM64.yaml | 5 ++--- .github/workflows/OCV-Contrib-PR-4.x-macOS-x86_64.yaml | 5 ++--- .github/workflows/OCV-Contrib-PR-5.x-ARM64.yaml | 4 ++-- .github/workflows/OCV-Contrib-PR-5.x-U20.yaml | 4 ++-- .github/workflows/OCV-Contrib-PR-5.x-W10.yaml | 4 ++-- .github/workflows/OCV-Contrib-PR-5.x-macOS-ARM64.yaml | 5 ++--- .github/workflows/OCV-Contrib-PR-5.x-macOS-x86_64.yaml | 5 ++--- .github/workflows/OCV-Coverage-4.x-U20.yaml | 6 +++--- .github/workflows/OCV-PR-3.4-ARM64.yaml | 4 ++-- .github/workflows/OCV-PR-3.4-U14.yaml | 4 ++-- .github/workflows/OCV-PR-3.4-U20.yaml | 4 ++-- .github/workflows/OCV-PR-3.4-W10.yaml | 4 ++-- .github/workflows/OCV-PR-3.4-macOS-ARM64.yaml | 5 ++--- .github/workflows/OCV-PR-3.4-macOS-x86_64.yaml | 5 ++--- .github/workflows/OCV-PR-4.x-ARM64-Debug.yaml | 4 ++-- .github/workflows/OCV-PR-4.x-ARM64.yaml | 4 ++-- .github/workflows/OCV-PR-4.x-U20.yaml | 4 ++-- .github/workflows/OCV-PR-4.x-W10.yaml | 4 ++-- .github/workflows/OCV-PR-4.x-macOS-ARM64.yaml | 5 ++--- .github/workflows/OCV-PR-4.x-macOS-x86_64.yaml | 5 ++--- .github/workflows/OCV-PR-5.x-ARM64-Debug.yaml | 4 ++-- .github/workflows/OCV-PR-5.x-ARM64.yaml | 4 ++-- .github/workflows/OCV-PR-5.x-U20.yaml | 4 ++-- .github/workflows/OCV-PR-5.x-W10.yaml | 4 ++-- .github/workflows/OCV-PR-5.x-macOS-ARM64.yaml | 5 ++--- .github/workflows/OCV-PR-5.x-macOS-x86_64.yaml | 5 ++--- 35 files changed, 71 insertions(+), 83 deletions(-) diff --git a/.github/workflows/OCV-Contrib-PR-3.4-ARM64.yaml b/.github/workflows/OCV-Contrib-PR-3.4-ARM64.yaml index 8d69d3c5..1ff2ddc5 100644 --- 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 index 639c8a8b..7a6ce677 100644 --- 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 index beb74f42..1b4846ff 100644 --- 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 index a13f1c71..df39099a 100644 --- 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 index d3420c92..d34c1ebd 100644 --- 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 index ad16b7f2..9744f160 100644 --- 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 index 043773ad..e71def86 100644 --- 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 index 42845f53..a9082727 100644 --- 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 index ae17c7a6..6346f27b 100644 --- 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 index 011c5180..93f9ef4a 100644 --- 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 index b270ee4d..41fe1676 100644 --- 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 index ed616d38..9e9c9655 100644 --- 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 index a0491e5e..fdbf2c9f 100644 --- 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 index 19505c83..5c0a668b 100644 --- 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 index aa4a58bc..8a91bd8a 100644 --- 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 index 730472cd..ef37195d 100644 --- 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 index df31edc8..7d8b88a9 100644 --- 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 \ No newline at end of file + 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 index 2285fcb6..d748a3a3 100644 --- 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 index 2b5b9d11..9b8f7c4d 100644 --- 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 index 9637fb40..ccab7ad4 100644 --- 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 index eed996c8..cffe5b88 100644 --- 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 index c6da72d3..1cce9cd8 100644 --- 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 index 31f0ddae..95de8ee7 100644 --- 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 index f2683371..f7c37b82 100644 --- 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 index 942afc8d..5c5cfc74 100644 --- 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 index 88028d0a..fe9743be 100644 --- 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 index da190ef3..9b720f9a 100644 --- 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 index be24a6cd..d86d7fd6 100644 --- 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 index 35a42090..d306d8f6 100644 --- 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 index 53defdf0..65c57052 100644 --- 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 index 73ac693c..ab23084e 100644 --- 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 index e139fc1b..07af0f4e 100644 --- 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 index 4772cf8e..f646187e 100644 --- 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 diff --git a/.github/workflows/OCV-PR-5.x-macOS-ARM64.yaml b/.github/workflows/OCV-PR-5.x-macOS-ARM64.yaml index d5c8cd0f..99fb3aca 100644 --- a/.github/workflows/OCV-PR-5.x-macOS-ARM64.yaml +++ b/.github/workflows/OCV-PR-5.x-macOS-ARM64.yaml @@ -269,9 +269,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-macOS-x86_64.yaml b/.github/workflows/OCV-PR-5.x-macOS-x86_64.yaml index 144d4cfc..86dc3c0b 100644 --- a/.github/workflows/OCV-PR-5.x-macOS-x86_64.yaml +++ b/.github/workflows/OCV-PR-5.x-macOS-x86_64.yaml @@ -270,9 +270,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