Skip to content

Commit d00d104

Browse files
authored
Merge pull request #96 from BerkeleyLab/fix-gfortran-13
Workaround gfortran 13 issue
2 parents b0f044c + f573e09 commit d00d104

File tree

3 files changed

+15
-4
lines changed

3 files changed

+15
-4
lines changed

src/julienne/julienne_test_s.F90

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,29 @@
44
#include "language-support.F90"
55

66
submodule(julienne_test_m) julienne_test_s
7+
use julienne_test_description_m, only : test_description_t
78
implicit none
89

910
contains
1011

12+
#if __GNUC__ && ( __GNUC__ > 13)
13+
1114
module procedure run
1215
associate(matching_descriptions => filter(test_descriptions, test%subject()))
1316
test_results = matching_descriptions%run()
1417
end associate
1518
end procedure
1619

20+
#else
21+
22+
module procedure run
23+
type(test_description_t), allocatable :: matching_descriptions(:)
24+
matching_descriptions = filter(test_descriptions, test%subject())
25+
test_results = matching_descriptions%run()
26+
end procedure
27+
28+
#endif
29+
1730
module procedure report
1831
logical, save :: do_first_report = .true.
1932

test/idiomatic-assertion-failure-test.F90 renamed to test/idiomatic_assertion_failure_test.F90

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
#include "julienne-assert-macros.h"
55

6-
program test_julienne_assert_intentional_failure
6+
program idiomatic_assertion_failure_test
77
!! Conditionally test an assertion that is hardwired to fail.
88
use julienne_m, only : call_julienne_assert_, command_line_t, operator(.equalsExpected.)
99
implicit none
@@ -23,4 +23,3 @@ program test_julienne_assert_intentional_failure
2323
end associate
2424

2525
end program
26-

test/logical-assertion-failure-test.F90 renamed to test/logical_assertion_failure_test.F90

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
#include "julienne-assert-macros.h"
55

6-
program test_julienne_assert_intentional_failure
6+
program logical_assertion_failure_test
77
!! Conditionally test an assertion that is hardwired to fail.
88
use julienne_m, only : call_julienne_assert_, command_line_t, operator(.equalsExpected.)
99
implicit none
@@ -25,4 +25,3 @@ program test_julienne_assert_intentional_failure
2525
end associate
2626

2727
end program
28-

0 commit comments

Comments
 (0)