Speed up the tests and xfail some more.

This closes  #753



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1938094 13f79535-47bb-0310-9956-ffa450edef68

Author: jfclere

.github/workflows/windows.yml

@@ -44,13 +44,13 @@ jobs:
       matrix:
         include:
           - name: Default
-            triplet: x64-windows
+            triplet: x64-windows-release
             arch: x64
             build-type: Release
             generator: "Ninja"
 
     runs-on: windows-latest
-    timeout-minutes: 60
+    timeout-minutes: 40
     name: ${{ matrix.name }}
     env: 
       VCPKG_BINARY_SOURCES: "clear;x-gha,readwrite"
@@ -78,14 +78,18 @@ jobs:
       - name: Configure CMake
         run: |
             cmake --version
-            cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{ matrix.build-type }} `
+            cmake -B ${{github.workspace}}/build `
                 -G "${{ matrix.generator }}" `
+                -DCMAKE_BUILD_TYPE=${{ matrix.build-type }} `
                 -DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake `
+                -DVCPKG_TARGET_TRIPLET=${{ matrix.triplet }} `
                 -DAPR_INCLUDE_DIR=C:/vcpkg/installed/${{ matrix.triplet }}/include `
                 "-DAPR_LIBRARIES=C:/vcpkg/installed/${{ matrix.triplet }}/lib/libapr-1.lib;C:/vcpkg/installed/${{ matrix.triplet }}/lib/libaprutil-1.lib" `
                 -DNGHTTP2_INCLUDE_DIR=C:/vcpkg/installed/${{ matrix.triplet }}/include `
                 -DNGHTTP2_LIBRARIES=C:/vcpkg/installed/${{ matrix.triplet }}/lib/nghttp2.lib `
+                -DJANSSON_INCLUDE_DIR=C:/vcpkg/installed/${{ matrix.triplet }}/include `
                 -DJANSSON_LIBRARIES=C:/vcpkg/installed/${{ matrix.triplet }}/lib/jansson.lib `
+                -DENABLE_MIME_MAGIC=A `
                 -DBUILD_TEST_MODULES=true
 
       - name: Build
@@ -96,7 +100,7 @@ jobs:
         run: |
             cmake --install ${{github.workspace}}/build --config ${{ matrix.build-type }}
 
-      - name: Install dependencies
+      - name: Install Tools for tests
         env:
           VCPKG_DIR: C:\vcpkg
           VCPKG_TRIPLET: ${{ matrix.triplet }}

test/conftest.py

@@ -187,6 +187,7 @@ def _package_scope(env, request):
             "AH00337",
             "AH00338",
             "AH00341",
+            "AH02322",
         ])
     if sys.platform == "win32" and _has_ipv6():
         env.httpd_error_log.add_ignored_lognos(["AH00332"])

test/modules/core/test_008_restart.py

@@ -1,3 +1,5 @@
+import sys
+
 import pytest
 
 from pyhttpd.conf import HttpdConf
@@ -47,6 +49,9 @@ def test_core_008_02_ungraceful(self, env):
         assert env.read_pid_file() == pid, "the restart replaced the parent"
         self.get(env, "after an ungraceful restart")
 
+    @pytest.mark.xfail(sys.platform == "win32", reason=
+                        "mpm_winnt restart does not wait for child exit, "
+                        "rapid restarts cause AH02322 socket errors")
     def test_core_008_03_repeated(self, env):
         """Restarting twice in a row is no different from once."""
         for _ in range(2):

test/pyhttpd/install_tools.bat

@@ -35,8 +35,16 @@ if not exist "%PREFIX%\bin\httpd.exe" (
 
 rem --- python detection and install --------------------------------------------
 set PYTHON=
-for /f "delims=" %%D in ('dir /b /o-n "%LOCALAPPDATA%\Programs\Python\Python3*" 2^>nul') do (
-    if not defined PYTHON set "PYTHON=%LOCALAPPDATA%\Programs\Python\%%D\python.exe"
+for /f "delims=" %%P in ('where python.exe 2^>nul') do (
+    if not defined PYTHON (
+        echo %%P | findstr /i "hostedtoolcache" >nul
+        if not errorlevel 1 set "PYTHON=%%P"
+    )
+)
+if not defined PYTHON (
+    for /f "delims=" %%D in ('dir /b /o-n "%LOCALAPPDATA%\Programs\Python\Python3*" 2^>nul') do (
+        if not defined PYTHON set "PYTHON=%LOCALAPPDATA%\Programs\Python\%%D\python.exe"
+    )
 )
 if not defined PYTHON (
     for /f "delims=" %%D in ('dir /b /o-n "%PROGRAMFILES%\Python3*" 2^>nul') do (

test/pyhttpd/runtests.bat

@@ -25,6 +25,14 @@ if "%HERE:~-1%"=="\" set "HERE=%HERE:~0,-1%"
 rem --- python location: find the newest native Windows Python 3.x -------------
 if not defined PYTHON (
     set PYTHON=
+    for /f "delims=" %%P in ('where python.exe 2^>nul') do (
+        if not defined PYTHON (
+            echo %%P | findstr /i "hostedtoolcache" >nul
+            if not errorlevel 1 set "PYTHON=%%P"
+        )
+    )
+)
+if not defined PYTHON (
     for /f "delims=" %%D in ('dir /b /o-n "%LOCALAPPDATA%\Programs\Python\Python3*" 2^>nul') do (
         if not defined PYTHON set "PYTHON=%LOCALAPPDATA%\Programs\Python\%%D\python.exe"
     )