Skip to content

Commit 2fa83f8

Browse files
committed
tests/conversions: fence only the per-rank sub-world (the fixture already fences the global world; with one rank the sub-world is the global world)
1 parent 0cd7c8d commit 2fa83f8

1 file changed

Lines changed: 8 additions & 6 deletions

File tree

‎tests/conversions.cpp‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -325,9 +325,10 @@ BOOST_AUTO_TEST_CASE(tiles_of_array_unit_blocking) {
325325
// deferred deletions complete while it is alive; otherwise the task runs
326326
// later, from some unrelated fence, against a freed World and the
327327
// WorldObject destructor aborts (seen as an asynchronous "Abort trap" in the
328-
// two-rank CI run, attributed to whichever test case runs next).
329-
this_world.gop.fence();
330-
(*GlobalFixture::world).gop.fence();
328+
// two-rank CI run, attributed to whichever test case runs next). The global
329+
// world is fenced by the fixture destructor after every case; with one rank
330+
// `this_world` IS the global world and needs nothing here.
331+
if (world_ptr) world_ptr->gop.fence();
331332
}
332333

333334
#if 1
@@ -439,9 +440,10 @@ BOOST_AUTO_TEST_CASE(tiles_of_arrays_non_unit_blocking) {
439440
// deferred deletions complete while it is alive; otherwise the task runs
440441
// later, from some unrelated fence, against a freed World and the
441442
// WorldObject destructor aborts (seen as an asynchronous "Abort trap" in the
442-
// two-rank CI run, attributed to whichever test case runs next).
443-
this_world.gop.fence();
444-
(*GlobalFixture::world).gop.fence();
443+
// two-rank CI run, attributed to whichever test case runs next). The global
444+
// world is fenced by the fixture destructor after every case; with one rank
445+
// `this_world` IS the global world and needs nothing here.
446+
if (world_ptr) world_ptr->gop.fence();
445447
}
446448
#endif
447449

0 commit comments

Comments
 (0)