Skip to content

Commit cfdf44a

Browse files
committed
Tweak CMake dev msgs & remove 292 from open issues
- Also, confirmed that Andre's change(s) fixes #292
1 parent 4966b61 commit cfdf44a

File tree

2 files changed

+25
-16
lines changed

2 files changed

+25
-16
lines changed

CMakeLists.txt

Lines changed: 25 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,11 @@ set ( CMAKE_BUILD_TYPE "Release"
66
CACHE STRING "Select which configuration to build." )
77
set_property ( CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS ${CMAKE_CONFIGURATION_TYPES} )
88
message( STATUS
9-
"================================================
10-
Building configuration: ${CMAKE_BUILD_TYPE}
11-
================================================")
9+
"
10+
============================================================
11+
Building OpenCoarrays configuration: ${CMAKE_BUILD_TYPE}
12+
============================================================
13+
")
1214

1315
# Add option and check environment to determine if developer tests should be run
1416
if($ENV{OPENCOARRAYS_DEVELOPER})
@@ -626,7 +628,7 @@ endfunction(add_caf_test)
626628

627629
if(opencoarrays_aware_compiler)
628630
if (CAF_RUN_DEVELOPER_TESTS OR $ENV{OPENCOARRAYS_DEVELOPER})
629-
message ( STATUS "Running Developer tests is enabled." )
631+
message ( STATUS "Running Developer tests is enabled. Some tests may fail for open issues." )
630632
endif()
631633
# Unit tests targeting each libcaf_mpi function, argument, and branch of code
632634
add_caf_test(initialize_mpi 2 initialize_mpi)
@@ -656,18 +658,21 @@ if(opencoarrays_aware_compiler)
656658
add_caf_test(send_convert_nums 2 send_convert_nums)
657659
add_caf_test(sendget_convert_nums 3 sendget_convert_nums)
658660
add_caf_test(sendget_convert_char_array 3 sendget_convert_char_array)
659-
660-
elseif((NOT CMAKE_Fortran_COMPILER_VERSION VERSION_LESS 7.3.0) OR (CAF_RUN_DEVELOPER_TESTS OR $ENV{OPENCOARRAYS_DEVELOPER}))
661-
add_caf_test(send_with_vector_index 2 send_with_vector_index)
661+
else()
662+
message( AUTHOR_WARNING "Skipping the following tests due to GFortran < 7.0.0 lack of compatibility:
663+
sendget_convert_nums.f90
664+
sendget_convert_char_array.f90
665+
send_convert_nums.f90")
666+
endif()
667+
if((NOT CMAKE_Fortran_COMPILER_VERSION VERSION_LESS 7.3.0) OR (CAF_RUN_DEVELOPER_TESTS OR $ENV{OPENCOARRAYS_DEVELOPER}))
668+
if(NOT DEFINED ENV{TRAVIS})
669+
add_caf_test(send_with_vector_index 2 send_with_vector_index) # Hang times out on Travis-CI
670+
endif()
662671
add_caf_test(send_convert_char_array 2 send_convert_char_array)
663672
else()#if((CAF_RUN_DEVELOPER_TESTS OR $ENV{OPENCOARRAYS_DEVELOPER}))
664-
message( AUTHOR_WARNING "The following tests may be skipped due to GFortran < 7.3.0 or < 7.0.0 lack of compatibility:
665-
sendget_convert_nums.f90 (>= 7.0.0)
666-
sendget_convert_char_array.f90 (>= 7.0.0)
667-
send_convert_nums.f90 (>= 7.0.0)
668-
send_convert_char_array.f90 (>= 7.3.0)
669-
send_with_vector_index.f90 (>= 7.3.0)"
670-
)
673+
message( AUTHOR_WARNING "Skipping the following tests to GFortran < 7.3.0 lack of compatibility:
674+
send_convert_char_array.f90
675+
send_with_vector_index.f90")
671676
endif()
672677
endif()
673678

@@ -682,6 +687,7 @@ if(opencoarrays_aware_compiler)
682687

683688
# Pure send tests
684689
add_caf_test(send_array 2 send_array)
690+
add_caf_test(convert-before-put 3 convert-before-put)
685691

686692
# Pure sendget tests
687693
add_caf_test(strided_sendget 3 strided_sendget)
@@ -727,9 +733,13 @@ if(opencoarrays_aware_compiler)
727733
(CMAKE_Fortran_COMPILER_VERSION VERSION_LESS 7.0.0) OR
728734
(NOT CMAKE_Fortran_COMPILER_VERSION VERSION_LESS 7.3.0)
729735
)))
730-
add_caf_test(convert-before-put 3 convert-before-put)
731736
add_caf_test(put-allocatable-coarray-comp 2 issue-422-send)
732737
add_caf_test(get-put-allocatable-comp 3 issue-422-send-get)
738+
else()
739+
message( AUTHOR_WARNING
740+
"Skipping regressions in GFortran 7.0:
741+
put-allocatable-coarray-comp (issue-422)
742+
get-put-allocatable-comp (issue-422)")
733743
endif()
734744

735745
add_caf_test(allocatable_p2p_event_post 4 allocatable_p2p_event_post)

src/tests/regression/open/issue-292

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)