From ee09339b12615915c27522b6fdb2bc2d13ef947a Mon Sep 17 00:00:00 2001 From: Tom Clune Date: Wed, 1 Nov 2023 11:35:07 -0400 Subject: [PATCH 1/4] Workarounds for gfortran-13.2 --- ChangeLog.md | 4 ++++ src/pfunit/pFUnit.F90 | 10 +--------- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/ChangeLog.md b/ChangeLog.md index c579be8f..8515a0d7 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -5,6 +5,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] + +### Fixed +- Several workarounds added to enable building with gfortran 13.2. Polymorphic assignment is broken, and must be replaced by `ALLOCATE(obj,source=...)`. But apparently not everywhere? + ### Changed - Updated CI to remove gcc-9 from macOS11 and add gcc-12 diff --git a/src/pfunit/pFUnit.F90 b/src/pfunit/pFUnit.F90 index 2d987195..f319c6e7 100644 --- a/src/pfunit/pFUnit.F90 +++ b/src/pfunit/pFUnit.F90 @@ -104,17 +104,9 @@ logical function run(load_tests) result(status) type(TestResult) :: r class(ParallelContext), allocatable :: c - c = get_context() + allocate(c, source=get_context()) status = generic_run(load_tests, c) -!!! !!$ options = parse() - -!!$ suite = load_tests() -!!$ allocate(runner, source=TestRunner(ResultPrinter(OUTPUT_UNIT))) -!!$ c = get_context() -!!$ r = runner%run(suite, c) -!!$ status = r%wasSuccessful() - end function run From bfe1801a76bc4153366db463e6b6da5450f68050 Mon Sep 17 00:00:00 2001 From: Tom Clune Date: Wed, 1 Nov 2023 11:52:37 -0400 Subject: [PATCH 2/4] Update ChangeLog.md --- ChangeLog.md | 1 + 1 file changed, 1 insertion(+) diff --git a/ChangeLog.md b/ChangeLog.md index 8515a0d7..da5e7f10 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -5,6 +5,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +## [4.7.4] - 2023-11-01 ### Fixed - Several workarounds added to enable building with gfortran 13.2. Polymorphic assignment is broken, and must be replaced by `ALLOCATE(obj,source=...)`. But apparently not everywhere? From 85500a48111e9d7266a178d1126235f99ee37ffe Mon Sep 17 00:00:00 2001 From: Tom Clune Date: Wed, 1 Nov 2023 11:52:54 -0400 Subject: [PATCH 3/4] Update CMakeLists.txt --- CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0e723e40..68c6e74b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -26,6 +26,7 @@ cmake_minimum_required(VERSION 3.12) project (PFUNIT VERSION 4.7.3 + 4 LANGUAGES Fortran C) cmake_policy(SET CMP0077 NEW) From 7159b8d0a9229d0c9abba9b92c61cdb9b4161fd3 Mon Sep 17 00:00:00 2001 From: Tom Clune Date: Wed, 1 Nov 2023 11:59:12 -0400 Subject: [PATCH 4/4] Update CMakeLists.txt --- CMakeLists.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 68c6e74b..83579713 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -25,8 +25,7 @@ cmake_minimum_required(VERSION 3.12) project (PFUNIT - VERSION 4.7.3 - 4 + VERSION 4.7.4 LANGUAGES Fortran C) cmake_policy(SET CMP0077 NEW)