Skip to content

Commit 71ef01c

Browse files
committed
Make test names more meaningful
Also add some comments
1 parent 1da451b commit 71ef01c

File tree

5 files changed

+68
-28
lines changed

5 files changed

+68
-28
lines changed

CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -595,9 +595,9 @@ if(opencoarrays_aware_compiler)
595595
add_mpi_test(get-put-alloc-comp 3 ${tests_root}/regression/reported/issue-422-send-get)
596596
endif()
597597

598-
add_mpi_test(event_post_1 4 ${tests_root}/unit/events/event_post_1)
598+
add_mpi_test(allocatable_p2p_event_post 4 ${tests_root}/unit/events/allocatable_p2p_event_post)
599599
# Fixed GCC 7 regressions, should run on GCC 6 and 7
600-
add_mpi_test(event_post_2 3 ${tests_root}/unit/events/event_post_2)
600+
add_mpi_test(static_event_post_issue_293 3 ${tests_root}/unit/events/static_event_post_issue_293)
601601

602602
# These co_reduce (#172, fixed by PR #332, addl discussion in PR
603603
# #331) tests are for bugs not regressions. Should be fixed in all

src/tests/unit/events/CMakeLists.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
# Fortran tests
22

3-
add_executable(event_post_1 event_post_1.f90)
4-
target_link_libraries(event_post_1 OpenCoarrays)
3+
add_executable(allocatable_p2p_event_post allocatable_p2p_event_post.f90)
4+
target_link_libraries(allocatable_p2p_event_post OpenCoarrays)
55

6-
add_executable(event_post_2 event_post_2.f90)
7-
target_link_libraries(event_post_2 OpenCoarrays)
6+
add_executable(static_event_post_issue_293 static_event_post_issue_293.f90)
7+
target_link_libraries(static_event_post_issue_293 OpenCoarrays)
88

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
! BSD 3-Clause License
2+
!
3+
! Copyright (c) 2016, Sourcery Institute
4+
! All rights reserved.
5+
!
6+
! Redistribution and use in source and binary forms, with or without
7+
! modification, are permitted provided that the following conditions are met:
8+
!
9+
! * Redistributions of source code must retain the above copyright notice, this
10+
! list of conditions and the following disclaimer.
11+
!
12+
! * Redistributions in binary form must reproduce the above copyright notice,
13+
! this list of conditions and the following disclaimer in the documentation
14+
! and/or other materials provided with the distribution.
15+
!
16+
! * Neither the name of the copyright holder nor the names of its
17+
! contributors may be used to endorse or promote products derived from
18+
! this software without specific prior written permission.
19+
!
20+
! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
21+
! AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
22+
! IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
23+
! DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
24+
! FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
25+
! DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
26+
! SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
27+
! CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
28+
! OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
29+
! OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
30+
31+
! Comments preceded by "!!" are formatted for the FORD docoumentation generator
32+
program allocatable_p2p_event_post
33+
!! author: Andre Vehreschild
34+
!! date: 2017-08-05
35+
!! category: unit-test
36+
!! Basic events test testing receipt of event post from one image to another
37+
use iso_fortran_env, only: event_type
38+
implicit none
39+
40+
type(event_type), allocatable :: snd_copied(:)[:]
41+
42+
if (num_images() < 4) error stop "num_images() >= 4 required for even_post_1 test"
43+
associate(me => this_image(), np => num_images())
44+
allocate(snd_copied(np)[*])
45+
if (me == 2) print*,'I am image 2, I am posting to 4'
46+
if (me == 2) event post(snd_copied(2)[4])
47+
if (me == 2) print*,' I am image 2, I have posted to 4'
48+
if (me == 4) then
49+
event wait(snd_copied(2))
50+
sync images(*) ! sync not required, but *may* expose cleanup issues/segfaults etc.
51+
print *, 'Test passed.'
52+
end if
53+
if (me /= 4) then
54+
sync images(4)
55+
print *, 'I am', me, 'and image 4 told me it received the event'
56+
end if
57+
if (allocated(snd_copied)) deallocate(snd_copied)
58+
end associate
59+
end program
60+
! vim:ts=2:sts=2:sw=2:

src/tests/unit/events/event_post_1.f90

Lines changed: 0 additions & 20 deletions
This file was deleted.

src/tests/unit/events/event_post_2.f90 renamed to src/tests/unit/events/static_event_post_issue_293.f90

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
! OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
3030

3131
! Comments preceded by "!!" are formatted for the FORD docoumentation generator
32-
program main
32+
program static_event_post_issue_293
3333
!! author: Damian Rouson
3434
!! date: 2016-12-22
3535
!! category: regression
@@ -39,7 +39,7 @@ program main
3939
implicit none
4040
type(event_type) :: test_post[*]
4141

42-
if (num_images()<3) error stop "exposing issue 293 requires num_images()>=3"
42+
if (num_images()<3) error stop "exposing issue 293 requires num_images() >= 3"
4343
event post(test_post)
4444
if (this_image()==1) print *,"Test passed."
4545

0 commit comments

Comments
 (0)