merge back the master trunk into the smpi branch

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

diff --git a/testsuite/surf/surf_usage2.c b/testsuite/surf/surf_usage2.c
index 3dcab96..a30f0e4 100644 (file)
--- a/testsuite/surf/surf_usage2.c
+++ b/testsuite/surf/surf_usage2.c
@@ -11,6 +11,7 @@
 
 #include <stdio.h>
 #include "surf/surf.h"
+#include "surf/surf_resource.h"
 #include "surf/surfxml_parse.h" // for reset callback
 
 #include "xbt/log.h"
@@ -45,16 +46,9 @@ void test(char *platform)
   double now = -1.0;
   int running;
 
-  int workstation_id =
-      find_model_description(surf_workstation_model_description, "CLM03");
-  surf_parse_reset_callbacks();
-  surf_workstation_model_description[workstation_id].
-      model_init_preparse(platform);
+  xbt_cfg_set_parse(_surf_cfg_set, "network/model:CM02");
+  xbt_cfg_set_parse(_surf_cfg_set, "cpu/model:Cas01");
   parse_platform_file(platform);
-  if (surf_workstation_model_description[workstation_id].
-      model_init_postparse)
-    surf_workstation_model_description[workstation_id].
-        model_init_postparse();
 
   /*********************** WORKSTATION ***********************************/
   workstationA =