From 800984a98748ebd2255c0082cfda291b74755f26 Mon Sep 17 00:00:00 2001 From: Brent Shaffer Date: Fri, 28 Aug 2026 10:57:25 +0000 Subject: [PATCH 1/2] fix(ci): fix windows exempt test matching in run_conditional_tests.sh --- ci/run_conditional_tests.sh | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/ci/run_conditional_tests.sh b/ci/run_conditional_tests.sh index e42d0f82bdc..c8665d18a68 100755 --- a/ci/run_conditional_tests.sh +++ b/ci/run_conditional_tests.sh @@ -185,7 +185,14 @@ for subdir in ${subdirs[@]}; do # Our CI uses Git Bash on Windows to execute this script, which returns "msys" or "cygwin" for OSTYPE. if [[ "$OSTYPE" == "msys" || "$OSTYPE" == "cygwin" || "$OS" == "Windows_NT" ]]; then - if [[ "${windows_exempt_tests}" =~ "${d}" ]]; then + is_exempt=false + for exempt in ${windows_exempt_tests}; do + if [[ "${d}" == "${exempt}"* ]]; then + is_exempt=true + break + fi + done + if [[ "${is_exempt}" == "true" ]]; then echo "Skipping ${d} on Windows (in exemption list)" continue fi From 1d9d7adb07e60b624176094d45c4d2d2c79a693c Mon Sep 17 00:00:00 2001 From: Brent Shaffer Date: Fri, 28 Aug 2026 05:34:59 -0700 Subject: [PATCH 2/2] Update ci/run_conditional_tests.sh Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com> --- ci/run_conditional_tests.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/run_conditional_tests.sh b/ci/run_conditional_tests.sh index c8665d18a68..36e00d66c0f 100755 --- a/ci/run_conditional_tests.sh +++ b/ci/run_conditional_tests.sh @@ -187,7 +187,7 @@ for subdir in ${subdirs[@]}; do if [[ "$OSTYPE" == "msys" || "$OSTYPE" == "cygwin" || "$OS" == "Windows_NT" ]]; then is_exempt=false for exempt in ${windows_exempt_tests}; do - if [[ "${d}" == "${exempt}"* ]]; then + if [[ "${d}" == "${exempt}" || "${d}" == "${exempt}/"* ]]; then is_exempt=true break fi