From 4f7a26c5b18c12f85391d95375439b11ffd6c3d2 Mon Sep 17 00:00:00 2001
From: Hartmut Kaiser <hartmut.kaiser@gmail.com>
Date: Fri, 20 Nov 2020 17:34:11 -0600
Subject: [PATCH] Attempt to fix remaining test failures

---
 flecsi/data/hpx/data_client_handle_policy.h   | 1 +
 flecsi/execution/hpx/task_add_dependencies.h  | 8 +++++---
 flecsi/execution/test/ghost_access_drivers.cc | 3 ++-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/flecsi/data/hpx/data_client_handle_policy.h b/flecsi/data/hpx/data_client_handle_policy.h
index 6a8ee335c..514cd6408 100644
--- a/flecsi/data/hpx/data_client_handle_policy.h
+++ b/flecsi/data/hpx/data_client_handle_policy.h
@@ -12,6 +12,7 @@
 
 #include <flecsi/execution/hpx/future.h>
 #include <flecsi/runtime/types.h>
+#include <flecsi/topology/mesh_types.h>
 
 namespace flecsi {
 
diff --git a/flecsi/execution/hpx/task_add_dependencies.h b/flecsi/execution/hpx/task_add_dependencies.h
index 2faf939db..98529019a 100644
--- a/flecsi/execution/hpx/task_add_dependencies.h
+++ b/flecsi/execution/hpx/task_add_dependencies.h
@@ -146,13 +146,15 @@ struct task_add_dependencies_t
   } // handle
 
   template<typename Ragged, typename T2>
-  void handle(Ragged & m1, ragged_mutator<T2> & m2) {
-    handle(m1, m2.handle);
+  void handle(Ragged & r1, ragged_mutator<T2> & r2) {
+    r1.future = future;
+    has_dependencies = true;
   }
 
   template<typename Sparse, typename T2>
   void handle(Sparse & m1, sparse_mutator<T2> & m2) {
-    handle(m1, m2.ragged);
+    m1.future = future;
+    has_dependencies = true;
   }
 
   template<typename Client, typename T, size_t PERMISSIONS>
diff --git a/flecsi/execution/test/ghost_access_drivers.cc b/flecsi/execution/test/ghost_access_drivers.cc
index d47e9c009..ad55fcc4b 100644
--- a/flecsi/execution/test/ghost_access_drivers.cc
+++ b/flecsi/execution/test/ghost_access_drivers.cc
@@ -93,8 +93,9 @@ driver(int argc, char ** argv) {
     flecsi_execute_task_simple(
       set_primary_cells_task, index, handle, test_handle, cycle);
 
-    flecsi_execute_task_simple(
+    auto future = flecsi_execute_task_simple(
       check_all_cells_task, index, handle, test_handle, cycle);
+    future.get(); // make sure that next iteration doesn't start prematurely
   }
 
 } // driver