From 1dda3c51adabf474fada2dca98d07cff39d601ea Mon Sep 17 00:00:00 2001 From: phfix <35774904+phfix@users.noreply.github.com> Date: Tue, 10 Mar 2026 22:14:46 +0100 Subject: [PATCH] test/cache_api: avoid false rpt_fcn pointer mismatch on Windows (#6274) * test: avoid false function-pointer mismatch for rpt_fcn on Windows * test: relax rpt_fcn comparison for MinGW --- .github/workflows/msys2.yml | 4 ++-- test/cache_common.c | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/msys2.yml b/.github/workflows/msys2.yml index 7cef086e37a..060dbbdcc18 100644 --- a/.github/workflows/msys2.yml +++ b/.github/workflows/msys2.yml @@ -83,11 +83,11 @@ jobs: - name: Run Tests run: | - ctest . --parallel 2 -C ${{ inputs.build_mode }} -E "cache_api|dt_arith|err_compat" + ctest . --parallel 2 -C ${{ inputs.build_mode }} -E "dt_arith|err_compat" working-directory: ${{ runner.workspace }}/build - name: Run Expected to Fail Tests run: | - ctest . --parallel 2 -C ${{ inputs.build_mode }} -R "cache_api|dt_arith|err_compat" + ctest . --parallel 2 -C ${{ inputs.build_mode }} -R "dt_arith|err_compat" working-directory: ${{ runner.workspace }}/build continue-on-error: true diff --git a/test/cache_common.c b/test/cache_common.c index 334821b623e..45b64a9e4db 100644 --- a/test/cache_common.c +++ b/test/cache_common.c @@ -4990,8 +4990,12 @@ resize_configs_are_equal(const H5C_auto_size_ctl_t *a, const H5C_auto_size_ctl_t { if (a->version != b->version) return (false); + else if ((a->rpt_fcn == NULL) != (b->rpt_fcn == NULL)) + return (false); +#ifndef H5_HAVE_MINGW else if (a->rpt_fcn != b->rpt_fcn) return (false); +#endif else if (compare_init && (a->set_initial_size != b->set_initial_size)) return (false); else if (compare_init && (a->initial_size != b->initial_size))