From 6c06792f00fac35df8a8c3d49be653dbd8e7d42b Mon Sep 17 00:00:00 2001 From: Chun-wei Fan Date: Fri, 4 Oct 2024 12:54:51 +0800 Subject: [PATCH] CI: Skip PCRE2 tests for 32-bit Visual Studio builds ...in the main tests that we expect to pass. Due to an upstream issue in PCRE2-10.44, disable running the PCRE2 tests for now, until the next release (or so) of PCRE2, as the issue has already been resolved in upstream PCRE2 but has not made it to the PCRE2 release that we use for our subprojects. --- .gitlab-ci/test-msvc.bat | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci/test-msvc.bat b/.gitlab-ci/test-msvc.bat index 6e26e3970..9114f508f 100644 --- a/.gitlab-ci/test-msvc.bat +++ b/.gitlab-ci/test-msvc.bat @@ -12,7 +12,6 @@ for %%x in (%*) do ( ) set args=%args:~1% if "!plat!" == "" set plat=x64 - :: vcvarsall.bat sets various env vars like PATH, INCLUDE, LIB, LIBPATH for the :: specified build architecture call "C:\Program Files (x86)\Microsoft Visual Studio\2019\BuildTools\VC\Auxiliary\Build\vcvarsall.bat" !plat! @@ -21,7 +20,13 @@ pip3 install --upgrade --user meson==1.4.2 || goto :error meson setup %args% _build || goto :error meson compile -C _build || goto :error -meson test -v -C _build --timeout-multiplier %MESON_TEST_TIMEOUT_MULTIPLIER% || goto :error +:: FIXME: Skip PCRE2 tests for now for 32-bit x86 builds, until we pull in pcre2-10.45 (or so) +:: from our subprojects, as 32-bit Windows Visual Studio tests are fixed upstream +:: Upstream PRs: +:: https://github.com/PCRE2Project/pcre2/pull/480 +:: https://github.com/PCRE2Project/pcre2/pull/468 +if "!plat!" == "x64_x86" meson test -v -C _build --timeout-multiplier %MESON_TEST_TIMEOUT_MULTIPLIER% --no-suite pcre2 || goto :error +if not "!plat!" == "x64_x86" meson test -v -C _build --timeout-multiplier %MESON_TEST_TIMEOUT_MULTIPLIER% || goto :error meson test -v -C _build --timeout-multiplier %MESON_TEST_TIMEOUT_MULTIPLIER% --setup=unstable_tests --suite=failing --suite=flaky :: FIXME: can we get code coverage support?