re-enable OpenGL tests on Windows

silx-kit · Aug 29, 2024 · ed6d500 · ed6d500
1 parent dbdb3a0
commit ed6d500
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -93,10 +93,10 @@ jobs:
           python-version: ${{ matrix.python-version }}
           cache: "pip"
 
-      #- name: Install mesa OpenGL
-      #  if: runner.os == 'Windows'
-      #  run: |
-      #    curl -fsS -o opengl32.dll http://www.silx.org/pub/silx/continuous_integration/opengl32_mingw-mesa-x86_64.dll
+      - name: Install mesa OpenGL
+        if: runner.os == 'Windows'
+        run: |
+          curl -fsS -o opengl32.dll https://www.silx.org/pub/silx/continuous_integration/opengl32_mingw-mesa-x86_64.dll
 
       - name: Upgrade distribution modules
         run: |
@@ -148,5 +148,8 @@ jobs:
               Xorg -noreset +extension GLX +extension RANDR +extension RENDER -logfile ./99.log -config ./ci/xorg.conf :99 &
               sleep 3
           fi
+          if [ ${{ runner.os }} != 'Windows' ]; then
+              export WITH_GL_TEST=False
+          fi
           export QT_API=${{ matrix.QT_API }}
-          python -c "import silx.test, sys; sys.exit(silx.test.run_tests(verbosity=1, args=('--no-opengl', '--low-mem', '--qt-binding=${{ matrix.QT_API }}')));"
+          python -c "import silx.test, sys; sys.exit(silx.test.run_tests(verbosity=1, args=('--low-mem', '--qt-binding=${{ matrix.QT_API }}')));"
diff --git a/ci/appveyor.yml b/ci/appveyor.yml
@@ -53,7 +53,7 @@ install:
     - "python -m pip install %PIP_OPTIONS% --upgrade pip"
 
     # Download Mesa OpenGL in Python directory when testing OpenGL
-    - curl -o %PYTHON_DIR%\\opengl32.dll http://www.silx.org/pub/silx/continuous_integration/opengl32_mingw-mesa-x86_64.dll
+    - curl -fsS -o %PYTHON_DIR%\\opengl32.dll https://www.silx.org/pub/silx/continuous_integration/opengl32_mingw-mesa-x86_64.dll
 
 build_script:
     # Create build virtualenv
@@ -114,7 +114,7 @@ before_test:
 
 test_script:
     # Run tests with selected Qt binding and without OpenCL
-    - python -c "import silx.test, sys; sys.exit(silx.test.run_tests(verbosity=1, args=('--no-opengl', '--no-opencl', '--low-mem', '--qt-binding=%QT_API%')));"
+    - python -c "import silx.test, sys; sys.exit(silx.test.run_tests(verbosity=1, args=('--no-opencl', '--low-mem', '--qt-binding=%QT_API%')));"
 
 after_test:
     # Leave test virtualenv