Simplified the test set-up in the top-level CMakeLists.txt and refactored and renamed several tests to have more descriptive names or names that indicate we need to a assign more descriptive names.

Author: rouson

CMakeLists.txt

@@ -65,29 +65,11 @@ target_link_libraries(OpenCoarrays INTERFACE caf_mpi)
 
 enable_testing()
 
-# Name each test and indicate the corresponding executable
-add_test(NAME hello_world COMMAND hello_multiverse)
-add_test(NAME distributed_transpose COMMAND coarray_distributed_transpose)
-add_test(NAME burgers_pde COMMAND coarray_burgers_pde)
-add_test(NAME heat_equation COMMAND co_heat)
-add_test(NAME sync_images COMMAND sync_images)
-add_test(NAME is_there_a_better_name COMMAND is_there_a_better_name)
-add_test(NAME increment_my_neighbor COMMAND increment_my_neighbor)
-add_test(NAME co_broadcast COMMAND co_broadcast)
-add_test(NAME atomics COMMAND atomics)
-add_test(NAME C_hello_world COMMAND C_hello_world)
-add_test(NAME C_sync_images COMMAND C_sync_images)
-
-if ("${CMAKE_SYSTEM_NAME}" MATCHES "Linux" )
-  add_test(navier-stokes src/tests/integration/pde_solvers/navier-stokes/coarray_navier_stokes)
-  set_property(TEST navier-stokes PROPERTY PASS_REGULAR_EXPRESSION "Test passed.")
-endif()
-
 set(tests_to_build 
- hello_world 
- distributed_transpose 
- burgers_pde 
- heat_equation 
+ hello_multiverse
+ coarray_distributed_transpose 
+ coarray_burgers_pde 
+ co_heat
  sync_images 
  is_there_a_better_name 
  increment_my_neighbor 
@@ -99,5 +81,11 @@ set(tests_to_build
 
 # Define the string that each test output must contain to indicate passing
 foreach(tests ${tests_to_build})
+  add_test(NAME ${tests} COMMAND ${tests})
   set_property(TEST ${tests} PROPERTY PASS_REGULAR_EXPRESSION "Test passed.")
 endforeach()
+
+if ("${CMAKE_SYSTEM_NAME}" MATCHES "Linux" )
+  add_test(NAME navier-stokes COMMAND coarray_navier_stokes)
+  set_property(TEST navier-stokes PROPERTY PASS_REGULAR_EXPRESSION "Test passed.")
+endif()

src/tests/integration/coarrayHelloWorld/hello_multiverse.F90

@@ -51,7 +51,7 @@ program hello_multiverse
     block 
       integer, parameter :: expected_location=23,max_single_digit=9
       do image=2,min(num_images(),max_single_digit)
-        ! Verify that the greetings have their image number at the expected location:
+        ! Verify that the greetings of images 1-9 have their image number at the expected location:
         if (scan(greeting[image],set="123456789")/=expected_location) error stop "Test failed."
       end do
     end block

src/tests/unit/CMakeLists.txt

@@ -1,2 +1,3 @@
 add_subdirectory(simple)
 add_subdirectory(send-get)
+add_subdirectory(init_register)

src/tests/unit/init_register/CMakeLists.txt

@@ -1,11 +1,11 @@
-add_executable(initmpi1 initmpi1.f90)
-target_link_libraries(initmpi1 OpenCoarrays)
+add_executable(initialize_mpi initialize_mpi.f90)
+target_link_libraries(initialize_mpi OpenCoarrays)
 
-add_executable(register1 register1.f90)
-target_link_libraries(register1 OpenCoarrays)
+add_executable(register register.f90)
+target_link_libraries(register OpenCoarrays)
 
-add_executable(register2 register2.f90)
-target_link_libraries(register2 OpenCoarrays)
+add_executable(register_rename_me register_rename_me.f90)
+target_link_libraries(register_rename_me OpenCoarrays)
 
-add_executable(register3 register3.f90)
-target_link_libraries(register3 OpenCoarrays)
+add_executable(register_rename_me_too register_rename_me_too.f90)
+target_link_libraries(register_rename_me_too OpenCoarrays)

src/tests/unit/init_register/register1.f90 src/tests/unit/init_register/initialize_mpi.f90

@@ -1,4 +1,4 @@
-! Unit test for register procedure. Testing static coarrays.
+! Unit test for initializion of MPI by LIBCAF_MPI.
 !
 ! Copyright (c) 2012-2014, Sourcery, Inc.
 ! All rights reserved.
@@ -24,38 +24,23 @@
 ! ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 ! (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 ! SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-program register1
+!
+program initialize_mpi
+  use mpi, only : MPI_COMM_SIZE,MPI_COMM_WORLD
   implicit none
-  include 'mpif.h'
-  integer :: np,ierr,me_next
-
-  np = -2
-  np = num_images()
 
-  call image()
-  
-  if(this_image() == 1) then
-     call image(me_next)
-     if(me_next == 2) then 
-        write(*,*) 'Test passed.'
-     else
-        write(*,*) 'Test failed.'
-     end if
-  endif
+  ! Set invalid default image number and number of ranks
+  integer :: me=-1,np=-1,ierr
 
-contains
+  ! Get image number
+  me = this_image()
 
-subroutine image(me_next)
-  implicit none
-  integer,intent(out),optional :: me_next
-  integer,save :: me[*] = -1
-  if(me == -1) then
-     me = this_image()
-  end if
-  if(present(me_next) .and. me == 1) then
-     me_next = me[2]
-  end if
-end subroutine image
+  ! Get number of ranks (np)
+  call MPI_COMM_SIZE(MPI_COMM_WORLD,np,ierr)
 
-end program register1
+  ! Everybody verifies that they have a valid image number and rank
+  if(me < 1 .or. np < 1) error stop "Test failed."
+
+  ! Image 1 reports test success
+  if(me==1) print *,"Test passed."
+end program 

src/tests/unit/init_register/initmpi1.f90 src/tests/unit/init_register/register.f90

@@ -1,4 +1,4 @@
-! Unit test for init procedure. MPI is initialized by LIBCAF_MPI.
+! Unit test for register procedure. Testing static coarrays.
 !
 ! Copyright (c) 2012-2014, Sourcery, Inc.
 ! All rights reserved.
@@ -25,20 +25,22 @@
 ! (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 ! SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-program initmpi1
+program register
   implicit none
-  include 'mpif.h'
+  integer, parameter :: invalid_image_number=-1
+  integer, save :: me[*] = invalid_image_number
+
+  if (num_images()<2) error stop "This test requires at least 2 images."
 
-  integer :: me,np,ierr
-  me = -1
-  np = -2
   me = this_image()
-  call MPI_COMM_SIZE(MPI_COMM_WORLD,np,ierr)
 
-  if(me /= -1 .and. np /= -2) then
-     if(me==1) write(*,*) 'Test passed.'
-  else
-     write(*,*) 'Test failed.'
+  if(me == 1) then
+    block 
+      integer :: image2number
+      image2number = me[2]
+      if (image2number/= 2) error stop "Test failed."
+      print *,"Test passed."
+    end block
   end if
 
-end program initmpi1
+end program 

src/tests/unit/init_register/register2.f90 src/tests/unit/init_register/register_rename_me.f90

@@ -27,22 +27,17 @@
 
 program register2
   implicit none
-  include 'mpif.h'
-  integer :: np,ierr
-  integer,dimension(10),codimension[*] :: arr1
+  integer, parameter :: array_size=10
+  integer :: np, arr1(array_size)[*]
 
-  np = -2
   np = num_images()
   arr1 = this_image()
 
   sync all
 
   if(this_image() == 1) then
-     if(size(arr1) == 10) then
-        write(*,*) 'Test passed.'
-     else
-        write(*,*) 'Test failed.'
-     end if
+     if(size(arr1) /= array_size) error stop 'Test failed.'
+     print *,'Test passed.'
   endif
 
-end program register2
+end program 

src/tests/unit/init_register/register3.f90 src/tests/unit/init_register/register_rename_me_too.f90

@@ -27,34 +27,23 @@
 
 program register3
   implicit none
-  include 'mpif.h'
-  integer :: np,ierr
-  integer,allocatable :: arr1(:)[:]
-  logical :: res = .true.
+  integer, parameter :: invalid_rank=-2
+  integer :: np=invalid_rank,array_size=10
+  integer,allocatable :: array(:)[:]
 
-  np = -2
   np = num_images()
+  allocate(array(array_size)[*],source=this_image())
 
-  allocate(arr1(10)[*])
+  block
+    logical :: res = .true.
+    if(this_image() == 1) then
+      if(size(array) /= array_size) error stop "Test failed."
+    endif
 
-  arr1 = this_image()
-
-  if(this_image() == 1) then
-     if(size(arr1) == 10) then
-        res = res .and. .true.
-     else
-        res = res .and. .false.
-     end if
-  endif
-
-  deallocate(arr1)
-
-  if(this_image() == 1) then
-     if(.not.allocated(arr1) .and. res.eqv..true.) then
-        write(*,*) 'Test passed.'
-     else
-        write(*,*) 'Test failed.'
-     end if
-  end if
+    deallocate(array)
+  
+    if(allocated(array)) error stop "Test failed."
+    if(this_image() == 1) print *,"Test passed."
+  end block
 
-end program register3
+end program