Merge branch 'master' into cmake-cleanup

Author: zbeekman

CMakeLists.txt

@@ -399,7 +399,7 @@ if(opencoarrays_aware_compiler)
   add_mpi_test(hello_multiverse 2 ${tests_root}/integration/coarrayHelloWorld/hello_multiverse)
   add_mpi_test(coarray_burgers_pde 2 ${tests_root}/integration/pde_solvers/coarrayBurgers/coarray_burgers_pde)
   add_mpi_test(co_heat 2 ${tests_root}/integration/pde_solvers/coarrayHeatSimplified/co_heat)
-  add_mpi_test(asynchronous_hello_world 2 ${tests_root}/integration/events/asynchronous_hello_world)
+  add_mpi_test(asynchronous_hello_world 3 ${tests_root}/integration/events/asynchronous_hello_world)
   if ( ("${CMAKE_SYSTEM_PROCESSOR}" MATCHES "x86_64") AND ("${CMAKE_SYSTEM_NAME}" MATCHES "Linux") )
     if ( (NOT (DEFINED ENV{TRAVIS})) AND (NOT SKIP_ASSEMBLY_DEPS) )
       add_mpi_test(coarray_navier_stokes 2 ${tests_root}/integration/pde_solvers/navier-stokes/coarray_navier_stokes)
@@ -409,6 +409,7 @@ if(opencoarrays_aware_compiler)
 
   # Regression tests based on reported issues
   add_mpi_test(convert-before-put 3 ${tests_root}/regression/reported/convert-before-put)
+  add_mpi_test(event-post 3 ${tests_root}/regression/reported/event-post)
 else()
   add_test(co_sum_extension ${tests_root}/unit/extensions/test-co_sum-extension.sh)
   set_property(TEST co_sum_extension PROPERTY PASS_REGULAR_EXPRESSION "Test passed.")

src/tests/integration/events/CMakeLists.txt

@@ -1,2 +1,2 @@
-add_executable(asynchronous_hello_world async-hello.f90)
+add_executable(asynchronous_hello_world async-hello.F90)
 target_link_libraries(asynchronous_hello_world OpenCoarrays)

src/tests/integration/events/async-hello.f90 renamed to src/tests/integration/events/async-hello.F90

@@ -69,7 +69,11 @@ program main
     end do
 
     sync all
+! Hardwire failure with GCC 7 (remove this preprocessor conditional after the silent failure with GCC 7 has been eliminated)
+#if __GNUC__ >= 7
+#else
     if (me==1) print *,"Test passed."
+#endif
 
   end associate
 

src/tests/regression/open/issue-290

@@ -0,0 +1 @@
+../reported/issue-292-convert-type-before-put.f90

src/tests/regression/open/issue-292

@@ -0,0 +1 @@
+../reported/issue-293-silent-event-failure.F90

src/tests/regression/open/issue-293

@@ -1,2 +1,5 @@
-add_executable(convert-before-put issue-290-convert-type-before-put.f90)
+add_executable(convert-before-put issue-292-convert-type-before-put.f90)
 target_link_libraries(convert-before-put OpenCoarrays)
+
+add_executable(event-post issue-293-silent-event-failure.F90)
+target_link_libraries(event-post OpenCoarrays)

src/tests/regression/reported/CMakeLists.txt

@@ -34,7 +34,7 @@ program main
   !! date: 2016-12-21
   !! category: regression
   !! Test whether implicit type conversion occurs before coarray put
-  !! OpenCoarrays issue #280
+  !! OpenCoarrays issue #292
   use iso_fortran_env, only : error_unit
   implicit none
   real :: a[*]

src/tests/regression/reported/issue-290-convert-type-before-put.f90 renamed to src/tests/regression/reported/issue-292-convert-type-before-put.f90

@@ -0,0 +1,50 @@
+! BSD 3-Clause License
+!
+! Copyright (c) 2016, Sourcery Institute
+! All rights reserved.
+!
+! Redistribution and use in source and binary forms, with or without
+! modification, are permitted provided that the following conditions are met:
+!
+! * Redistributions of source code must retain the above copyright notice, this
+!   list of conditions and the following disclaimer.
+!
+! * Redistributions in binary form must reproduce the above copyright notice,
+!   this list of conditions and the following disclaimer in the documentation
+!   and/or other materials provided with the distribution.
+!
+! * Neither the name of the copyright holder nor the names of its
+!   contributors may be used to endorse or promote products derived from
+!   this software without specific prior written permission.
+!
+! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+! AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+! IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+! DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+! FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+! DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+! SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+! CAUSED AND 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.
+
+! Comments preceded by "!!" are formatted for the FORD docoumentation generator
+program main
+  !! author: Damian Rouson
+  !! date: 2016-12-22
+  !! category: regression
+  !! Test posting a static event_type coarray
+  !! OpenCoarrays issue #293
+  use iso_fortran_env, only : event_type
+  implicit none
+  type(event_type) :: test_post[*]
+
+  if (num_images()<3) error stop "exposing issue 293 requires num_images()>=3"
+  event post(test_post)
+! Hardwire failure with GCC 7 (remove this preprocessor conditional after the silent failure with GCC 7 has been eliminated)
+#if __GNUC__ >= 7
+#else
+    if (this_image()==1) print *,"Test passed."
+#endif
+
+end program