Skip to content

Commit 7096bc3

Browse files
committed
Run GCC7 regressions when GCC<7 OR dev tests on
- Better/accurate logic to control when open GCC7 regressions are run - Moved `co_reduce_string` test to be with other `co_reduce...` tests
1 parent 96e9253 commit 7096bc3

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

CMakeLists.txt

+6-4
Original file line numberDiff line numberDiff line change
@@ -560,6 +560,7 @@ if(opencoarrays_aware_compiler)
560560
add_mpi_test(duplicate_syncimages 8 ${tests_root}/unit/sync/duplicate_syncimages)
561561
add_mpi_test(co_reduce 4 ${tests_root}/unit/collectives/co_reduce_test)
562562
add_mpi_test(co_reduce_res_im 4 ${tests_root}/unit/collectives/co_reduce_res_im)
563+
add_mpi_test(co_reduce_string 4 ${tests_root}/unit/collectives/co_reduce_string)
563564
add_mpi_test(syncimages_status 8 ${tests_root}/unit/sync/syncimages_status)
564565
add_mpi_test(sync_ring_abort_np3 3 ${tests_root}/unit/sync/sync_image_ring_abort_on_stopped_image)
565566
add_mpi_test(sync_ring_abort_np7 7 ${tests_root}/unit/sync/sync_image_ring_abort_on_stopped_image)
@@ -578,16 +579,17 @@ if(opencoarrays_aware_compiler)
578579
# GFortran PR 78505 only fixed on trunk/gcc 7
579580
add_mpi_test(source-alloc-no-sync 8 ${tests_root}/regression/reported/source-alloc-sync)
580581
endif()
581-
if (CAF_RUN_DEVELOPER_TESTS OR $ENV{OPENCOARRAYS_DEVELOPER})
582+
583+
# Open GCC 7 regressions
584+
if ((CAF_RUN_DEVELOPER_TESTS OR $ENV{OPENCOARRAYS_DEVELOPER}) OR (gfortran_compiler AND (CMAKE_Fortran_COMPILER_VERSION VERSION_LESS 7.0.0)))
582585
add_mpi_test(convert-before-put 3 ${tests_root}/regression/reported/convert-before-put)
586+
add_mpi_test(put-alloc-comp 2 ${tests_root}/regression/reported/issue-422-send)
587+
add_mpi_test(get-put-alloc-comp 3 ${tests_root}/regression/reported/issue-422-send-get)
583588
endif()
584589
add_mpi_test(event-post 3 ${tests_root}/regression/reported/event-post)
585590
add_mpi_test(co_reduce-factorial 4 ${tests_root}/regression/reported/co_reduce-factorial)
586591
add_mpi_test(co_reduce-factorial-int8 4 ${tests_root}/regression/reported/co_reduce-factorial-int8)
587592
add_mpi_test(co_reduce-factorial-int64 4 ${tests_root}/regression/reported/co_reduce-factorial-int64)
588-
add_mpi_test(put-alloc-comp 2 ${tests_root}/regression/reported/issue-422-send)
589-
add_mpi_test(get-put-alloc-comp 3 ${tests_root}/regression/reported/issue-422-send-get)
590-
add_mpi_test(co_reduce_string 4 ${tests_root}/unit/collectives/co_reduce_string)
591593

592594
# IMAGE FAIL tests
593595
if(NOT CMAKE_Fortran_COMPILER_VERSION VERSION_LESS 7)

0 commit comments

Comments
 (0)