Skip to content

Commit addbd33

Browse files
tarunprabhutarunprabhu
authored
[Fortran/gfortran] Switch to using the static test configuration files (#97)
Switches the existing build system to use the static test configuration files that were added to the repository in previous commits. The previous method is jettisoned in its entirety. Several tests have been disabled in the process. Some of these are because of limitations in the build system which will be fixed in the future. Others ought to have failed earlier but did not because they were not being built with the correct compiler flags.
1 parent cd6cafd commit addbd33

File tree

20 files changed

+341
-275
lines changed

20 files changed

+341
-275
lines changed

‎Fortran/gfortran/CMakeLists.txt

Lines changed: 238 additions & 208 deletions
Large diffs are not rendered by default.

‎Fortran/gfortran/regression/CMakeLists.txt

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,7 @@
1111
set(PREFIX_EXECUTE "gfortran-regression-execute")
1212
set(PREFIX_COMPILE "gfortran-regression-compile")
1313

14-
set(TESTS)
15-
gfortran_populate_tests(TESTS)
16-
gfortran_add_execute_tests_from("${TESTS}")
17-
gfortran_add_compile_tests_from("${TESTS}")
14+
gfortran_populate_tests()
1815

1916
add_subdirectory(analyzer)
2017
add_subdirectory(asan)

‎Fortran/gfortran/regression/DisabledFiles.cmake

Lines changed: 85 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1791,6 +1791,30 @@ file(GLOB SKIPPED_FILES CONFIGURE_DEPENDS
17911791
pr93524.f90
17921792
public_private_module_3.f90
17931793
static_linking_1.f
1794+
1795+
# ----------------------------------------------------------------------------
1796+
#
1797+
# These files are only intended to be run on AArch64, but we don't currently
1798+
# process the target attribute, so these are disabled everywhere. When the
1799+
# DejaGNU target attribute is handled correctly, these should be removed from
1800+
# here.
1801+
pr101158.f90
1802+
pr88833.f90
1803+
pr98974.F90
1804+
1805+
# ----------------------------------------------------------------------------
1806+
#
1807+
# These tests have a -J flag but the build system adds a -J of its own and
1808+
# exactly one is allowed. If the build system is changed, these can be removed
1809+
# from here.
1810+
include_14.f90
1811+
include_15.f90
1812+
include_16.f90
1813+
include_17.f90
1814+
include_18.f90
1815+
include_19.f90
1816+
include_20.f90
1817+
include_8.f90
17941818
)
17951819

17961820
# These tests are disabled because they fail when they are expected to pass.
@@ -1820,6 +1844,23 @@ file(GLOB FAILING_FILES CONFIGURE_DEPENDS
18201844
Wall.f90 # no warning for missing & on continuation line in char constant
18211845
Wno-all.f90 # no warning for missing & on continuation line in char constant
18221846
bessel_7.f90 # unclear
1847+
bounds_check_10.f90
1848+
bounds_check_7.f90
1849+
bounds_check_array_ctor_1.f90
1850+
bounds_check_array_ctor_2.f90
1851+
bounds_check_array_ctor_6.f90
1852+
bounds_check_array_ctor_7.f90
1853+
bounds_check_array_ctor_8.f90
1854+
bounds_check_fail_4.f90
1855+
bounds_check_strlen_1.f90
1856+
bounds_check_strlen_2.f90
1857+
bounds_check_strlen_3.f90
1858+
bounds_check_strlen_4.f90
1859+
bounds_check_strlen_5.f90
1860+
bounds_check_strlen_7.f90
1861+
char_bounds_check_fail_1.f90
1862+
char_pointer_assign_4.f90
1863+
char_pointer_assign_5.f90
18231864
check_bits_1.f90 # requires -fcheck=bits to catch ISHFTC runtime error
18241865
check_bits_2.f90 # requires -fcheck=bits to catch ISHFTC runtime error
18251866
internal_dummy_2.f08 # causes flang-new to crash llvm-project/issues/76927
@@ -1828,10 +1869,16 @@ file(GLOB FAILING_FILES CONFIGURE_DEPENDS
18281869
dollar_edit_descriptor_4.f # TODO: (i3,$) format shouldn't advance record when looping
18291870
list_read_11.f90 # more CR character shenanigans
18301871
matmul_5.f90
1872+
matmul_bounds_10.f90
18311873
matmul_bounds_11.f90
18321874
matmul_bounds_13.f90
18331875
matmul_bounds_15.f
18341876
matmul_bounds_16.f
1877+
matmul_bounds_2.f90
1878+
matmul_bounds_3.f90
1879+
matmul_bounds_4.f90
1880+
matmul_bounds_5.f90
1881+
matmul_bounds_8.f90
18351882
matmul_bounds_7.f90
18361883
matmul_bounds_9.f90
18371884
maxloc_2.f90
@@ -1841,6 +1888,7 @@ file(GLOB FAILING_FILES CONFIGURE_DEPENDS
18411888
maxlocval_2.f90
18421889
maxlocval_4.f90
18431890
merge_bits_2.F90
1891+
merge_char_3.f90
18441892
minloc_1.f90
18451893
minlocval_1.f90
18461894
minlocval_4.f90
@@ -1880,6 +1928,11 @@ file(GLOB FAILING_FILES CONFIGURE_DEPENDS
18801928
pr96436_3.f90
18811929
pr96436_4.f90
18821930
pr96436_5.f90
1931+
pr96436_6.f90
1932+
pr96436_7.f90
1933+
pr96436_8.f90
1934+
pr96436_9.f90
1935+
pr96436_10.f90
18831936
promotion_3.f90
18841937
promotion_4.f90
18851938
promotion.f90
@@ -1911,7 +1964,10 @@ file(GLOB FAILING_FILES CONFIGURE_DEPENDS
19111964
real8-4.f90
19121965
real_const_3.f90
19131966
realloc_on_assign_11.f90
1967+
recursive_check_11.f90
1968+
recursive_check_13.f90
19141969
recursive_check_7.f90
1970+
recursive_check_9.f90
19151971
repeat_1.f90
19161972
reshape_order_1.f90
19171973
reshape_order_2.f90
@@ -1925,10 +1981,12 @@ file(GLOB FAILING_FILES CONFIGURE_DEPENDS
19251981
streamio_17.f90
19261982
streamio_4.f90
19271983
system_clock_3.f08
1984+
transpose_2.f90
19281985
unf_io_convert_4.f90
19291986
unf_read_corrupted_1.f90
19301987
unf_short_record_1.f90
19311988
unformatted_subrecord_1.f90
1989+
unpack_bounds_1.f90
19321990
unpack_bounds_2.f90
19331991
unpack_bounds_3.f90
19341992
utf8_1.f03
@@ -1954,10 +2012,37 @@ file(GLOB FAILING_FILES CONFIGURE_DEPENDS
19542012
entry_23.f
19552013
findloc_8.f90
19562014

2015+
# ---------------------------------------------------------------------------
2016+
#
2017+
# These tests are expected to raise a runtime error, but currently don't.
2018+
2019+
allocate_error_1.f90
2020+
cshift_bounds_2.f90
2021+
deallocate_error_1.f90
2022+
deallocate_error_2.f90
2023+
do_check_2.f90
2024+
do_check_3.f90
2025+
do_check_4.f90
2026+
do_check_11.f90
2027+
do_check_12.f90
2028+
endfile_4.f90
2029+
fmt_g0_2.f08
2030+
inline_sum_bounds_check_1.f90
2031+
inline_sum_bounds_check_2.f90
2032+
io_real_boz2.f90
2033+
io_real_boz_4.f90
2034+
io_real_boz_5.f90
2035+
no_unit_error_1.f90
2036+
pointer_check_10.f90
2037+
pointer_remapping_6.f08
2038+
19572039
# ---------------------------------------------------------------------------
19582040
#
19592041
# Compilation of these tests is expected to fail, but it succeeds instead.
19602042

2043+
binding_label_tests_26b.f90
2044+
test_common_binding_labels_2_main.f03
2045+
19612046
# Tests that exercise gfortran's ability to set -std=f95 and then see errors on newer features
19622047
abstract_type_1.f90
19632048
alloc_comp_constraint_7.f90

‎Fortran/gfortran/regression/analyzer/CMakeLists.txt

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,4 @@
66
#
77
#===------------------------------------------------------------------------===#
88

9-
set(TESTS)
10-
gfortran_populate_tests(TESTS)
11-
gfortran_add_execute_tests_from("${TESTS}")
12-
gfortran_add_compile_tests_from("${TESTS}")
9+
gfortran_populate_tests()

‎Fortran/gfortran/regression/asan/CMakeLists.txt

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,4 @@
66
#
77
#===------------------------------------------------------------------------===#
88

9-
set(TESTS)
10-
gfortran_populate_tests(TESTS)
11-
gfortran_add_execute_tests_from("${TESTS}")
12-
gfortran_add_compile_tests_from("${TESTS}")
9+
gfortran_populate_tests()

‎Fortran/gfortran/regression/c-interop/CMakeLists.txt

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,4 @@
66
#
77
#===------------------------------------------------------------------------===#
88

9-
set(TESTS)
10-
gfortran_populate_tests(TESTS)
11-
gfortran_add_execute_tests_from("${TESTS}")
12-
gfortran_add_compile_tests_from("${TESTS}")
9+
gfortran_populate_tests()

‎Fortran/gfortran/regression/coarray/CMakeLists.txt

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,4 @@
66
#
77
#===------------------------------------------------------------------------===#
88

9-
set(TESTS)
10-
gfortran_populate_tests(TESTS)
11-
gfortran_add_execute_tests_from("${TESTS}")
12-
gfortran_add_compile_tests_from("${TESTS}")
9+
gfortran_populate_tests()

‎Fortran/gfortran/regression/debug/CMakeLists.txt

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,4 @@
66
#
77
#===------------------------------------------------------------------------===#
88

9-
set(TESTS)
10-
gfortran_populate_tests(TESTS)
11-
gfortran_add_execute_tests_from("${TESTS}")
12-
gfortran_add_compile_tests_from("${TESTS}")
9+
gfortran_populate_tests()

‎Fortran/gfortran/regression/g77/CMakeLists.txt

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,4 @@
66
#
77
#===------------------------------------------------------------------------===#
88

9-
set(TESTS)
10-
gfortran_populate_tests(TESTS)
11-
gfortran_add_execute_tests_from("${TESTS}")
12-
gfortran_add_compile_tests_from("${TESTS}")
9+
gfortran_populate_tests()

‎Fortran/gfortran/regression/goacc-gomp/CMakeLists.txt

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,4 @@
66
#
77
#===------------------------------------------------------------------------===#
88

9-
set(TESTS)
10-
gfortran_populate_tests(TESTS)
11-
gfortran_add_execute_tests_from("${TESTS}")
12-
gfortran_add_compile_tests_from("${TESTS}" FFLAGS -fopenacc -fopenmp)
9+
gfortran_populate_tests(FFLAGS -fopenacc -fopenmp)

‎Fortran/gfortran/regression/goacc/CMakeLists.txt

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,4 @@
66
#
77
#===------------------------------------------------------------------------===#
88

9-
set(TESTS)
10-
gfortran_populate_tests(TESTS)
11-
gfortran_add_execute_tests_from("${TESTS}")
12-
gfortran_add_compile_tests_from("${TESTS}" FFLAGS -fopenacc)
9+
gfortran_populate_tests(FFLAGS -fopenacc)

‎Fortran/gfortran/regression/goacc/DisabledFiles.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ file(GLOB UNIMPLEMENTED_FILES CONFIGURE_DEPENDS
7878
# These tests are disabled because they cause flang to crash.
7979
file(GLOB SKIPPED_FILES CONFIGURE_DEPENDS
8080
# error: unsupported OpenACC operation:
81-
acc.bounds array-with-dt-1a.f90
81+
array-with-dt-1a.f90
8282
array-with-dt-1.f90
8383
array-with-dt-2.f90
8484
array-with-dt-3.f90

‎Fortran/gfortran/regression/gomp/CMakeLists.txt

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,4 @@
66
#
77
#===------------------------------------------------------------------------===#
88

9-
set(TESTS)
10-
gfortran_populate_tests(TESTS)
11-
gfortran_add_execute_tests_from("${TESTS}")
12-
gfortran_add_compile_tests_from("${TESTS}" FFLAGS -fopenmp)
9+
gfortran_populate_tests(FFLAGS -fopenmp)

‎Fortran/gfortran/regression/gomp/appendix-a/CMakeLists.txt

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,4 @@
66
#
77
#===------------------------------------------------------------------------===#
88

9-
set(TESTS)
10-
gfortran_populate_tests(TESTS)
11-
gfortran_add_execute_tests_from("${TESTS}")
12-
gfortran_add_compile_tests_from("${TESTS}" FFLAGS -fopenmp)
9+
gfortran_populate_tests(FFLAGS -fopenmp)

‎Fortran/gfortran/regression/ieee/CMakeLists.txt

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,4 @@
66
#
77
#===------------------------------------------------------------------------===#
88

9-
set(TESTS)
10-
gfortran_populate_tests(TESTS)
11-
gfortran_add_execute_tests_from("${TESTS}")
12-
gfortran_add_compile_tests_from("${TESTS}")
9+
gfortran_populate_tests()

‎Fortran/gfortran/regression/lto/CMakeLists.txt

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,4 @@
66
#
77
#===------------------------------------------------------------------------===#
88

9-
set(TESTS)
10-
gfortran_populate_tests(TESTS)
11-
gfortran_add_execute_tests_from("${TESTS}")
12-
gfortran_add_compile_tests_from("${TESTS}")
9+
gfortran_populate_tests()

‎Fortran/gfortran/regression/ubsan/CMakeLists.txt

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,4 @@
66
#
77
#===------------------------------------------------------------------------===#
88

9-
set(TESTS)
10-
gfortran_populate_tests(TESTS)
11-
gfortran_add_execute_tests_from("${TESTS}")
12-
gfortran_add_compile_tests_from("${TESTS}")
9+
gfortran_populate_tests()

‎Fortran/gfortran/regression/vect/CMakeLists.txt

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,4 @@
66
#
77
#===------------------------------------------------------------------------===#
88

9-
set(TESTS)
10-
gfortran_populate_tests(TESTS)
11-
gfortran_add_execute_tests_from("${TESTS}")
12-
gfortran_add_compile_tests_from("${TESTS}")
9+
gfortran_populate_tests()

‎Fortran/gfortran/torture/compile/CMakeLists.txt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,4 @@
66
#
77
#===------------------------------------------------------------------------===#
88

9-
set(TESTS)
10-
gfortran_populate_tests(TESTS)
11-
gfortran_add_compile_tests("${TESTS}")
9+
gfortran_populate_tests()

‎Fortran/gfortran/torture/execute/CMakeLists.txt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,4 @@
66
#
77
#===------------------------------------------------------------------------===#
88

9-
set(TESTS)
10-
gfortran_populate_tests(TESTS)
11-
gfortran_add_execute_tests("${TESTS}")
9+
gfortran_populate_tests()

0 commit comments

Comments
 (0)