stop messing with the surf internals from the test suite, so that these internals...

diff --git a/testsuite/surf/surf_usage.c b/testsuite/surf/surf_usage.c
index da1c4d2..103e1de 100644 (file)
--- a/testsuite/surf/surf_usage.c
+++ b/testsuite/surf/surf_usage.c
@@ -51,9 +51,8 @@ void test(char *platform)
   e_surf_action_state_t stateActionB;
   e_surf_action_state_t stateActionC;
   double now = -1.0;
-  surf_parse_reset_callbacks();
-  surf_cpu_model_init_Cas01();  /* Now it is possible to use CPUs */
-  surf_network_model_init_CM02();       /* Now it is possible to use eth0 */
+  xbt_cfg_set_parse(_surf_cfg_set, "cpu/model:Cas01");
+  xbt_cfg_set_parse(_surf_cfg_set, "network/model:CM02");
   parse_platform_file(platform);
 
   /*********************** CPU ***********************************/

diff --git a/testsuite/surf/surf_usage2.c b/testsuite/surf/surf_usage2.c
index d42d2b7..c539bcb 100644 (file)
--- a/testsuite/surf/surf_usage2.c
+++ b/testsuite/surf/surf_usage2.c
@@ -45,16 +45,8 @@ 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();
+  xbt_cfg_set_parse(_surf_cfg_set, "workstation/model:CLM03");
   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 =