when parallel ctests are performed, using the default tracing filename may cause...

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

diff --git a/testsuite/surf/surf_usage2.c b/testsuite/surf/surf_usage2.c
index 5c10de0..896f959 100644 (file)
--- a/testsuite/surf/surf_usage2.c
+++ b/testsuite/surf/surf_usage2.c
@@ -1,6 +1,6 @@
 /* A few basic tests for the surf library                                   */
 
-/* Copyright (c) 2004, 2005, 2006, 2007, 2008, 2009, 2010. The SimGrid Team.
+/* Copyright (c) 2004-2012. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
@@ -10,7 +10,9 @@
 #endif
 
 #include <stdio.h>
+#include "simgrid/sg_config.h"
 #include "surf/surf.h"
+#include "surf/surf_resource.h"
 #include "surf/surfxml_parse.h" // for reset callback
 
 #include "xbt/log.h"
@@ -42,23 +44,12 @@ void test(char *platform)
 {
   void *workstationA = NULL;
   void *workstationB = NULL;
-  surf_action_t actionA = NULL;
-  surf_action_t actionB = NULL;
-  surf_action_t actionC = NULL;
-  surf_action_t commAB = NULL;
   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(_sg_cfg_set, "network/model:CM02");
+  xbt_cfg_set_parse(_sg_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 =
@@ -71,18 +62,11 @@ void test(char *platform)
   XBT_DEBUG("%s : %p", surf_resource_name(workstationB), workstationB);
 
   /* Let's do something on it */
-  actionA =
-      surf_workstation_model->extension.workstation.execute(workstationA,
-                                                            1000.0);
-  actionB =
-      surf_workstation_model->extension.workstation.execute(workstationB,
-                                                            1000.0);
-  actionC =
-      surf_workstation_model->extension.workstation.sleep(workstationB,
-                                                          7.32);
-
-  commAB =
-      surf_workstation_model->extension.workstation.
+  surf_workstation_model->extension.workstation.execute(workstationA, 1000.0);
+  surf_workstation_model->extension.workstation.execute(workstationB, 1000.0);
+      surf_workstation_model->extension.workstation.sleep(workstationB, 7.32);
+
+  surf_workstation_model->extension.workstation.
       communicate(workstationA, workstationB, 150.0, -1.0);
 
   surf_solve(-1.0);                 /* Takes traces into account. Returns 0.0 */