X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/bdfe4f8674f98efbf2d67ad854ef83a1d5f855ed..9369cff380b2b3ec9ee6e4d7a682dec681ad31bf:/teshsuite/simdag/network/test_reinit_costs.c

diff --git a/teshsuite/simdag/network/test_reinit_costs.c b/teshsuite/simdag/network/test_reinit_costs.c
index a85311bf0e..55b6dedc06 100644
--- a/teshsuite/simdag/network/test_reinit_costs.c
+++ b/teshsuite/simdag/network/test_reinit_costs.c
@@ -1,6 +1,6 @@
 /* Computation tests                                                        */
 
-/* Copyright (c) 2007, 2009-2011. The SimGrid Team.
+/* Copyright (c) 2007, 2009-2011, 2013-2015. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
@@ -9,7 +9,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "simdag/simdag.h"
+#include "simgrid/simdag.h"
 
 /*
  * This test checks if the reinitialization of
@@ -28,7 +28,7 @@ static SD_task_t create_empty_cost_root()
   SD_task_t root;
 
   root = SD_task_create("Root", NULL, 1.0);
-  SD_task_schedule(root, 1, SD_workstation_get_list(), no_cost, no_cost,
+  SD_task_schedule(root, 1, sg_host_list(), no_cost, no_cost,
                    -1.0);
 
   return root;
@@ -38,25 +38,21 @@ static void zero_cost_test(int *argc, char *argv[])
 {
   double time;
   SD_task_t task;
-  xbt_dynar_t ret;
 
   SD_init(argc, argv);
   SD_create_environment(argv[1]);
 
   task = create_empty_cost_root();
-  ret = SD_simulate(-1.0);
-  xbt_dynar_free(&ret);
+  SD_simulate(-1.0);
   SD_task_destroy(task);
 
   SD_application_reinit();
 
   task = create_empty_cost_root();
-  ret = SD_simulate(-1.0);
-  xbt_dynar_free(&ret);
+  SD_simulate(-1.0);
   SD_task_destroy(task);
 
-  ret = SD_simulate(-1.0);
-  xbt_dynar_free(&ret);
+  SD_simulate(-1.0);
 
   time = SD_get_clock();
   printf("%g\n", time);
@@ -72,7 +68,7 @@ static SD_task_t create_root_with_costs()
   SD_task_t root;
 
   root = SD_task_create("Root", NULL, 1.0);
-  SD_task_schedule(root, 2, SD_workstation_get_list(), comp_cost,
+  SD_task_schedule(root, 2, sg_host_list(), comp_cost,
                    comm_cost, -1.0);
 
   return root;
@@ -82,25 +78,21 @@ static void zero_cost_test2(int *argc, char *argv[])
 {
   double time;
   SD_task_t task;
-  xbt_dynar_t ret;
 
   SD_init(argc, argv);
   SD_create_environment(argv[1]);
 
   task = create_root_with_costs();
-  ret = SD_simulate(-1.0);
-  xbt_dynar_free(&ret);
+  SD_simulate(-1.0);
   SD_task_destroy(task);
 
   SD_application_reinit();
 
   task = create_empty_cost_root();
-  ret =  SD_simulate(-1.0);
-  xbt_dynar_free(&ret);
+  SD_simulate(-1.0);
   SD_task_destroy(task);
 
-  ret = SD_simulate(-1.0);
-  xbt_dynar_free(&ret);
+  SD_simulate(-1.0);
 
   time = SD_get_clock();
   printf("%g\n", time);