Fix tests.

[simgrid.git] / testsuite / surf / surf_usage.c

diff --git a/testsuite/surf/surf_usage.c b/testsuite/surf/surf_usage.c
index 442fe61..9b01300 100644 (file)
--- a/testsuite/surf/surf_usage.c
+++ b/testsuite/surf/surf_usage.c
@@ -92,7 +92,7 @@ void test(char *platform)
 
   /* Let's do something on it */
   commAB =
-    surf_network_model->extension.network.communicate(cardA, cardB,
+    surf_network_model->extension.network.communicate("Cpu A","Cpu B", 0, 1, /* FIXME: hardcoding host number is bad */
                                                       150.0, -1.0);
 
   surf_solve();                 /* Takes traces into account. Returns 0.0 */
@@ -123,7 +123,9 @@ void test(char *platform)
       action->model_type->action_unref(action);
     }
 
-  } while (surf_solve() >= 0.0);
+  } while ((xbt_swag_size(surf_network_model->states.running_action_set) ||
+            xbt_swag_size(surf_cpu_model->states.running_action_set)) &&
+            surf_solve() >= 0.0);
 
   DEBUG0("Simulation Terminated");
 }