Limit new tests to proper compiler compatibility

Author: zbeekman

CMakeLists.txt

@@ -644,8 +644,27 @@ if(opencoarrays_aware_compiler)
     add_caf_test(async_comp_alloc_2 2 async_comp_alloc_2)
     add_caf_test(comp_allocated_1 2 comp_allocated_1)
     add_caf_test(comp_allocated_2 2 comp_allocated_2)
-    add_caf_test(get_with_vector_index 4 get_with_vector_index)
-    add_caf_test(send_with_vector_index 2 send_with_vector_index)
+  endif()
+
+
+  if (gfortran_compiler)
+    if((NOT CMAKE_Fortran_COMPILER_VERSION VERSION_LESS 7.0.0) OR (CAF_RUN_DEVELOPER_TESTS OR $ENV{OPENCOARRAYS_DEVELOPER}))
+      add_caf_test(send_convert_nums 2 send_convert_nums)
+      add_caf_test(sendget_convert_nums 3 sendget_convert_nums)
+      add_caf_test(sendget_convert_char_array 3 sendget_convert_char_array)
+
+    elseif((NOT CMAKE_Fortran_COMPILER_VERSION VERSION_LESS 7.3.0) OR (CAF_RUN_DEVELOPER_TESTS OR $ENV{OPENCOARRAYS_DEVELOPER}))
+      add_caf_test(send_with_vector_index 2 send_with_vector_index)
+      add_caf_test(send_convert_char_array 2 send_convert_char_array)
+    else()#if((CAF_RUN_DEVELOPER_TESTS OR $ENV{OPENCOARRAYS_DEVELOPER}))
+      message( AUTHOR_WARNING "The following tests may be skipped due to GFortran < 7.3.0 or < 7.0.0 lack of compatibility:
+        sendget_convert_nums.f90         (>= 7.0.0)
+        sendget_convert_char_array.f90   (>= 7.0.0)
+        send_convert_nums.f90            (>= 7.0.0)
+        send_convert_char_array.f90      (>= 7.3.0)
+        send_with_vector_index.f90       (>= 7.3.0)"
+      )
+    endif()
   endif()
 
   # Pure get tests
@@ -659,15 +678,11 @@ if(opencoarrays_aware_compiler)
 
   # Pure send tests
   add_caf_test(send_array 2 send_array)
-  add_caf_test(send_convert_char_array 2 send_convert_char_array)
 
   # Pure sendget tests
-  add_caf_test(sendget_convert_char_array 3 sendget_convert_char_array)
   add_caf_test(strided_sendget 3 strided_sendget)
-  if (gfortran_compiler AND (NOT CMAKE_Fortran_COMPILER_VERSION VERSION_LESS 7.3.0))
-    add_caf_test(sendget_convert_nums 3 sendget_convert_nums)
-    add_caf_test(send_convert_nums 2 send_convert_nums)
-  endif()
+  add_caf_test(get_with_vector_index 4 get_with_vector_index)
+
 
   add_caf_test(co_sum 4 co_sum_test)
   add_caf_test(co_broadcast 4 co_broadcast_test)
@@ -690,7 +705,7 @@ if(opencoarrays_aware_compiler)
   # Integration tests verifying the use of libcaf_mpi in applications
   add_caf_test(hello_multiverse 2 hello_multiverse)
   add_caf_test(coarray_burgers_pde 2 coarray_burgers_pde)
-#  add_caf_test(co_heat 2 co_heat)
+  add_caf_test(co_heat 2 co_heat)
   add_caf_test(asynchronous_hello_world 3 asynchronous_hello_world)
 
   # Regression tests based on reported issues
@@ -703,10 +718,14 @@ if(opencoarrays_aware_compiler)
   endif()
 
   # Open GCC 7 regressions
-  if ((CAF_RUN_DEVELOPER_TESTS OR $ENV{OPENCOARRAYS_DEVELOPER}) OR (gfortran_compiler AND (CMAKE_Fortran_COMPILER_VERSION VERSION_LESS 7.0.0)))
+  if ((CAF_RUN_DEVELOPER_TESTS OR $ENV{OPENCOARRAYS_DEVELOPER}) OR
+      (gfortran_compiler AND (
+	  (CMAKE_Fortran_COMPILER_VERSION VERSION_LESS 7.0.0) OR
+	  (NOT CMAKE_Fortran_COMPILER_VERSION VERSION_LESS 7.3.0)
+	  )))
     add_caf_test(convert-before-put 3 convert-before-put)
-    add_caf_test(put-alloc-comp 2 issue-422-send)
-    add_caf_test(get-put-alloc-comp 3 issue-422-send-get)
+    add_caf_test(put-allocatable-coarray-comp 2 issue-422-send)
+    add_caf_test(get-put-allocatable-comp 3 issue-422-send-get)
   endif()
 
   add_caf_test(allocatable_p2p_event_post 4 allocatable_p2p_event_post)

src/tests/unit/send-get/CMakeLists.txt

@@ -14,24 +14,18 @@ caf_compile_executable(get_with_vector_index get_with_vector_index.f90)
 
 ## Pure send() tests
 caf_compile_executable(send_array send_array_test.f90)
-caf_compile_executable(send_convert_char_array send_convert_char_array.f90)
+if(NOT CMAKE_Fortran_COMPILER_VERSION VERSION_LESS 7.0.0)
+  caf_compile_executable(send_convert_nums send_convert_nums.f90)
+endif()
 caf_compile_executable(send_with_vector_index send_with_vector_index.f90)
 
 # Pure sendget() tests
 caf_compile_executable(sendget_convert_char_array sendget_convert_char_array.f90)
+if(NOT CMAKE_Fortran_COMPILER_VERSION VERSION_LESS 7.0.0)
+  caf_compile_executable(sendget_convert_nums sendget_convert_nums.f90)
+endif()
+caf_compile_executable(send_convert_char_array send_convert_char_array.f90)
 #caf_compile_executable(sendget_with_vector_index sendget_with_vector_index.f90)
 caf_compile_executable(strided_sendget strided_sendget.f90)
 set_target_properties(build_strided_sendget
   PROPERTIES MIN_IMAGES 3)
-
-if (gfortran_compiler AND (NOT CMAKE_Fortran_COMPILER_VERSION VERSION_LESS 7.3.0))
-  caf_compile_executable(sendget_convert_nums sendget_convert_nums.f90)
-  caf_compile_executable(send_convert_nums send_convert_nums.f90)
-elseif((CAF_RUN_DEVELOPER_TESTS OR $ENV{OPENCOARRAYS_DEVELOPER}))
-  message( AUTHOR_WARNING
-    "Skipping building the following tests due to GFortran < 7.3.0 lack of compatibility:
-    sendget_convert_nums.f90"
-  )
-
-endif()
-