Skip to content

Commit 6114afd

Browse files
committed
Merge branch 'vehre/issue-292-type-conversion-during-communication' into issue-422-implement-by-refs
2 parents 361224c + 8eaa1a9 commit 6114afd

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed

CMakeLists.txt

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -667,14 +667,10 @@ if(opencoarrays_aware_compiler)
667667
send_convert_nums.f90")
668668
endif()
669669
if((NOT CMAKE_Fortran_COMPILER_VERSION VERSION_LESS 7.3.0) OR (CAF_RUN_DEVELOPER_TESTS OR $ENV{OPENCOARRAYS_DEVELOPER}))
670-
if(NOT DEFINED ENV{TRAVIS})
671-
add_caf_test(send_with_vector_index 2 send_with_vector_index) # Hang times out on Travis-CI
672-
endif()
673670
add_caf_test(send_convert_char_array 2 send_convert_char_array)
674671
else()#if((CAF_RUN_DEVELOPER_TESTS OR $ENV{OPENCOARRAYS_DEVELOPER}))
675672
message( AUTHOR_WARNING "Skipping the following tests to GFortran < 7.3.0 lack of compatibility:
676-
send_convert_char_array.f90
677-
send_with_vector_index.f90")
673+
send_convert_char_array.f90")
678674
endif()
679675
endif()
680676

@@ -690,6 +686,7 @@ if(opencoarrays_aware_compiler)
690686
# Pure send tests
691687
add_caf_test(send_array 2 send_array)
692688
add_caf_test(convert-before-put 3 convert-before-put)
689+
add_caf_test(send_with_vector_index 2 send_with_vector_index)
693690

694691
# Pure sendget tests
695692
add_caf_test(strided_sendget 3 strided_sendget)

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ program send_with_vector_index
99
if (np < 2) error stop "Need at least two images."
1010

1111
dst = -1
12+
sync all
13+
1214
if (me == 2) dst(indexes)[1] = [ 99, 999, 9999, 99999]
1315

1416
sync all

0 commit comments

Comments
 (0)