Enable all unit tests and fix them

 - simple/testAtomics.f90 is broken. I think there's a logic error in
   it. It has been disabled.
 - less verbose ctest output unless tests fail on Travis-CI

Author: zbeekman

.travis.yml

@@ -166,7 +166,7 @@ script:
       cd cmake-build
       cmake -DCMAKE_INSTALL_PREFIX:PATH="$HOME/OpenCoarrays" -DCMAKE_BUILD_TYPE="$BUILD_TYPE" ..
       make -j 4
-      ctest --verbose
+      ctest --output-on-failure
       make install
       cd ..
     fi

CMakeLists.txt

@@ -148,9 +148,12 @@ configure_file ( "${CMAKE_SOURCE_DIR}/cmake/uninstall.cmake.in" "${CMAKE_BINARY_
 add_custom_target ( uninstall
   COMMAND ${CMAKE_COMMAND} -P "${CMAKE_BINARY_DIR}/uninstall.cmake" )
 
-
 enable_testing()
 
+add_custom_target(check COMMAND ${CMAKE_CTEST_COMMAND} --output-on-failure)
+# See JSON-Fortran's CMakeLists.txt file to find out how to get the check target to depend
+# on the test executables
+
 # Determine if we're using Open MPI
 execute_process(COMMAND ${MPIEXEC} --version
   OUTPUT_VARIABLE mpi_version_out)
@@ -190,6 +193,7 @@ if(opencoarrays_aware_compiler)
   add_mpi_test(allocate_as_barrier 2 ${tests_root}/unit/init_register/allocate_as_barrier)
   add_mpi_test(allocate_as_barrier_proc 32 ${tests_root}/unit/init_register/allocate_as_barrier_proc)
   add_mpi_test(get_array 2 ${tests_root}/unit/send-get/get_array)
+  add_mpi_test(get_self 2 ${tests_root}/unit/send-get/get_self)
   add_mpi_test(send_array 2 ${tests_root}/unit/send-get/send_array)
   add_mpi_test(get_with_offset_1d 2 ${tests_root}/unit/send-get/get_with_offset_1d)
   add_mpi_test(whole_get_array 2 ${tests_root}/unit/send-get/whole_get_array)
@@ -200,9 +204,13 @@ if(opencoarrays_aware_compiler)
   add_mpi_test(co_max 4 ${tests_root}/unit/collectives/co_max_test)
   add_mpi_test(syncall 32 ${tests_root}/unit/sync/syncall)
   add_mpi_test(syncimages 32 ${tests_root}/unit/sync/syncimages)
+  add_mpi_test(syncimages2 32 ${tests_root}/unit/sync/syncimages2)
   add_mpi_test(duplicate_syncimages 8 ${tests_root}/unit/sync/duplicate_syncimages)
   add_mpi_test(co_reduce 4 ${tests_root}/unit/collectives/co_reduce_test)
   add_mpi_test(syncimages_status 32 ${tests_root}/unit/sync/syncimages_status)
+  add_mpi_test(simpleatomics 32 ${tests_root}/unit/simple/atomics)
+  # I think there is a logic error in the following test
+#  add_mpi_test(increment_my_neighbor 32 ${tests_root}/unit/simple/increment_my_neighbor)
 
   # Integration tests verifying the use of libcaf_mpi in applications
   add_mpi_test(hello_multiverse 2 ${tests_root}/integration/coarrayHelloWorld/hello_multiverse)

src/tests/unit/send-get/get_array_test.f90

@@ -14,8 +14,8 @@ program main
   call one(0, -11)
 
   ! Static coarrays
-!  call two()
-!  call three()
+  call two()
+  call three()
   write(*,*) 'Test passed'
 contains
   subroutine one(lb1, lb2)

src/tests/unit/send-get/sameloc.f90

@@ -12,6 +12,9 @@ program sameloc
   integer,dimension(9,10),codimension[*] :: m
   integer,dimension(10) :: t
   integer :: i,j
+  logical :: tests_passed
+
+  tests_passed = .true.
 
   a = 10
   b(1:5) = 1
@@ -36,9 +39,11 @@ program sameloc
   if(this_image() == 1) then
     c = m(1,:)[1]
     if(any(c(:) /= t(:))) then
-      call abort()
+      tests_passed = .false.
+      error stop "get row failed"
     else
-      write(*,*) 'ok get row'
+     tests_passed = tests_passed .and. .true.
+     write(*,*) 'ok get row'
     endif
   endif
 
@@ -48,12 +53,15 @@ program sameloc
     do i=1,10
       if(m(9,i)[1] /= t(i)) then
 	write(*,*) 'pos',i,'value get',m(9,i)[1],'value t',t(i)
-	call abort()
+        tests_passed = .false.
+        error stop "get element from matrix failed"
+      else
+        tests_passed = tests_passed .and. .true.
       endif
     enddo
   endif
 
-  if(this_image() == 1) write(*,*) 'Ok get element from matrix'
+  if (this_image() == 1) write(*,*) 'Ok get element from matrix'
 
   sync all
 
@@ -64,12 +72,15 @@ program sameloc
       m(9,i)[1] = i
       if(m(9,i)[1] /= t(i)) then
         write(*,*) 'pos',i,'value get',m(9,i)[1],'value t',t(i)
-        call abort()
+        tests_passed = .false.
+        error stop "put element from matrix failed"
+      else
+        tests_passed = tests_passed .and. .true.
       endif
     enddo
   endif
 
-  if(this_image() == 1 ) write(*,*) 'Ok put element from matrix'
+  if (this_image() == 1) write(*,*) 'Ok put element from matrix'
 
   t(:) = b(:)
   t(1:5) = b(2:6)
@@ -82,8 +93,10 @@ program sameloc
   if(this_image() == 1) then
     b(1:5)[1] = b(2:6)
     if(any(b(:) /= t(:))) then
-      call abort()
+      tests_passed = .false.
+      error stop "put overlapped failed"
     else
+      tests_passed = tests_passed .and. .true.
       write(*,*) 'OK put overlapped'
     endif
   endif
@@ -96,8 +109,10 @@ program sameloc
   if(this_image() == 1) then
     b(1:5)[1] = b(2:6)[1]
     if(any(b(:) /= t(:))) then
-      call abort()
+      tests_passed = .false.
+      error stop "putget overlapped failed"
     else
+      tests_passed = tests_passed .and. .true.
       write(*,*) 'OK putget overlapped'
     endif
   endif
@@ -110,11 +125,13 @@ program sameloc
   if(this_image() == 1) then
     c(10:1:-1)[1] = c(:)
     if(any(t(:) /= c(:))) then
+      tests_passed = .false.
       write(*,*) 'Error in put reversed'
       write(*,*) c
       write(*,*) t
-      call abort()
+      error stop "put reversed failed"
     else
+      tests_passed = tests_passed .and. .true.
       write(*,*) 'OK put reversed'
     endif
   endif
@@ -128,12 +145,24 @@ program sameloc
   if(this_image() == 1) then
     c(:) = c(10:1:-1)[1]
     if(any(t(:) /= c(:))) then
+      tests_passed = .false.
       write(*,*) c
       write(*,*) t
-      call abort()
+      error stop "get reversed failed"
     else
+      tests_passed = tests_passed .and. .true.
       write(*,*) 'OK get reversed'
     endif
   endif
 
+  if ( .not. tests_passed ) then
+     error stop "Test failures exist!"
+  end if
+
+  sync all
+
+  if ( tests_passed ) then
+    if (this_image() == 1) write(*,*) 'Test passed'
+  end if
+
 end program

src/tests/unit/simple/test1Caf.f90

@@ -52,12 +52,16 @@ program test1caf
 
   if(me < np) sync images(me+1)
 
+  sync all
+
   if (mod(me,2).eq.0) then
     if ( any(a(:)[right]/=a_initial+me)) error stop "Test failed."
   else
     if ( any(b(:)[left]/=b_initial+me)) error stop "Test failed."
   end if
 
+  sync all
+
   if (me==1) print *,"Test passed."
 
 end program test1caf

src/tests/unit/simple/testAtomics.f90

@@ -20,9 +20,15 @@ program atomic
   call atomic_ref(res,atom[1])
   if(res /= (np*(np+1))/2) then
     write(*,*) 'res',res
-    call abort()
+    error stop "Atomic ref failed"
   endif
   write(*,*) 'OK'
 endif
 
+sync all
+
+if (me == 1) then
+   write(*,*) "Test passed"
+end if
+
 end program

src/tests/unit/sync/CMakeLists.txt

@@ -4,6 +4,9 @@ target_link_libraries(syncall OpenCoarrays)
 add_executable(syncimages syncimages.f90)
 target_link_libraries(syncimages OpenCoarrays)
 
+add_executable(syncimages2 syncimages2.f90)
+target_link_libraries(syncimages2 OpenCoarrays)
+
 add_executable(duplicate_syncimages duplicate_syncimages.f90)
 target_link_libraries(duplicate_syncimages OpenCoarrays)