From 17868f96c45016095eedad649b7b16fa1dc38b2e Mon Sep 17 00:00:00 2001 From: Dan Bonachea Date: Mon, 30 Jun 2025 12:52:35 -0700 Subject: [PATCH 1/2] Fix issue #57: Assert 2.1.0 broke ASSERT_PARALLEL_CALLBACKS --- src/assert_m.f90 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/assert_m.f90 b/src/assert_m.f90 index 6561bd8..14aeb81 100644 --- a/src/assert_m.f90 +++ b/src/assert_m.f90 @@ -1,7 +1,8 @@ module assert_m !! Public interface + use assert_subroutine_m ! DO NOT PLACE AN ONLY CLAUSE HERE! + ! All public members of assert_subroutine_m are exported use intrinsic_array_m, only : intrinsic_array_t - use assert_subroutine_m, only : assert, assert_always use characterizable_m, only : characterizable_t ! The function below is public only to support automated From de562d02543e1336348497645aa83fa6fc7538c1 Mon Sep 17 00:00:00 2001 From: Dan Bonachea Date: Mon, 30 Jun 2025 13:03:03 -0700 Subject: [PATCH 2/2] CI: Ensure test coverage for -DASSERT_PARALLEL_CALLBACKS --- .github/workflows/build.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0c6a6e4..b94223b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -128,4 +128,9 @@ jobs: ( set +e ; fpm run --example false-assertion ${FPM_FLAGS} --flag "${{ matrix.EXTRA_FLAGS }}" ; test $? = $ERROR_STOP_CODE ) ( set +e ; fpm run --example invoke-via-macro ${FPM_FLAGS} --flag "${{ matrix.EXTRA_FLAGS }}" ; test $? = $ERROR_STOP_CODE ) - + - name: Test Assertions w/ Parallel Callbacks + env: + FPM_FLAGS: ${{ env.FPM_FLAGS }} --flag -DASSERTIONS --flag -DASSERT_MULTI_IMAGE --flag -DASSERT_PARALLEL_CALLBACKS + run: | + set -x + ( set +e ; fpm run --example false-assertion ${FPM_FLAGS} --flag "${{ matrix.EXTRA_FLAGS }}" ; test $? = $ERROR_STOP_CODE )