Skip to content

Commit 566763d

Browse files
authored
Merge pull request #163 from bonachea/remove-legacy-driver
Remove legacy test drivers (issue #161)
2 parents dd1a5a4 + df310a8 commit 566763d

File tree

5 files changed

+1
-145
lines changed

5 files changed

+1
-145
lines changed

test/driver.F90

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,9 @@
11
! Copyright (c) 2024-2025, The Regents of the University of California and Sourcery Institute
22
! Terms of use are as specified in LICENSE.txt
33

4-
#include "language-support.F90"
5-
64
program test_suite_driver
75
!! Julienne test-suite driver
86

9-
#if ! defined(__GNUC__) || (GCC_VERSION >= 140300)
10-
117
! Test infrastructure:
128
use julienne_m, only : test_fixture_t, test_harness_t
139

@@ -42,6 +38,4 @@ program test_suite_driver
4238
call test_harness%report_results
4339
end associate
4440

45-
#endif
46-
4741
end program

test/idiomatic_assertion_failure_test.F90

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ program idiomatic_assertion_failure_test
1515
associate(command_line => command_line_t(), me => 1)
1616
#endif
1717
if (.not. command_line%argument_present([character(len=len("--help"))::"--help","-h"])) then
18-
#ifdef TEST_INTENTIONAL_FAILURE
18+
#if TEST_INTENTIONAL_FAILURE && ASSERTIONS
1919
if (me==1) print '(a)', new_line('') // 'Test the intentional failure of an idiomatic assertion: ' // new_line('')
2020
call_julienne_assert(1 .equalsExpected. 2)
2121
#else

test/legacy-driver.F90

Lines changed: 0 additions & 84 deletions
This file was deleted.

test/legacy-unit_test_failure_test.F90

Lines changed: 0 additions & 49 deletions
This file was deleted.

test/unit_test_failure_test.F90

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
1-
#include "language-support.F90"
2-
31
program unit_test_failure_test
42
!! Conditionally execute test_test_t%report
53

6-
#if (! defined(__GNUC__)) || (GCC_VERSION >= 140300)
7-
84
use julienne_m, only : command_line_t, test_fixture_t, test_harness_t
95
use test_test_m, only : test_test_t
106
implicit none
@@ -33,6 +29,5 @@ program unit_test_failure_test
3329
end if
3430
end associate
3531
# endif
36-
#endif
3732

3833
end program

0 commit comments

Comments
 (0)