From: alegrand <alegrand@48e7efb5-ca39-0410-a469-dd3cf9ba447f>
Date: Thu, 2 Dec 2004 21:05:18 +0000 (+0000)
Subject: Using the Surf parser.
X-Git-Tag: v3.3~4813
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/14a7f0b86565fffa82281d21f562b57de5d61975

Using the Surf parser.


git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@537 48e7efb5-ca39-0410-a469-dd3cf9ba447f
---

diff --git a/testsuite/Makefile.am b/testsuite/Makefile.am
index f03368e88d..5ad009ddf6 100644
--- a/testsuite/Makefile.am
+++ b/testsuite/Makefile.am
@@ -8,7 +8,7 @@ EXTRA_DIST=run_tests.in \
   gras/datadesc.little32 gras/datadesc.little64 gras/datadesc.big32 gras/datadesc.big64 \
   gras/datadesc.aix \
   gras/mk_datadesc_structs.pl \
-  surf/trace_A.txt surf/trace_B.txt
+  surf/trace_A.txt surf/trace_B.txt surf/trace_A_failure.txt
 
 
 # Test stuff
diff --git a/testsuite/surf/platform.txt b/testsuite/surf/platform.txt
new file mode 100644
index 0000000000..cd6f270006
--- /dev/null
+++ b/testsuite/surf/platform.txt
@@ -0,0 +1,6 @@
+<CPU>
+
+  "Cpu A" 100.00 1.0 trace_A.txt ON trace_A_failure.txt
+  "Cpu B" 100.00 1.0 trace_B.txt ON  ""
+       
+</CPU>
\ No newline at end of file
diff --git a/testsuite/surf/surf_usage.c b/testsuite/surf/surf_usage.c
index 622c9bd117..e07e7750a3 100644
--- a/testsuite/surf/surf_usage.c
+++ b/testsuite/surf/surf_usage.c
@@ -40,7 +40,7 @@ void test(void)
   xbt_maxmin_float_t now = -1.0;
 
   surf_init(); /* Initialize some common structures */
-  surf_cpu_resource_init(NULL); /* Now it is possible to use CPUs */
+  surf_cpu_resource_init("platform.txt"); /* Now it is possible to use CPUs */
 
   printf("%p \n", surf_cpu_resource);
   cpuA = surf_cpu_resource->common_public->name_service("Cpu A");
diff --git a/testsuite/surf/trace_A.txt b/testsuite/surf/trace_A.txt
index 3fcb2ac1af..73f8eb8767 100644
--- a/testsuite/surf/trace_A.txt
+++ b/testsuite/surf/trace_A.txt
@@ -1,4 +1,4 @@
-PERIODICITY 100.01
-1.1 100.0
-15.2 20.0
-20.4 80.24
+PERIODICITY 1.0
+0.0 1.0
+11.0 0.5
+20.0 0.9
diff --git a/testsuite/surf/trace_A_failure.txt b/testsuite/surf/trace_A_failure.txt
new file mode 100644
index 0000000000..0610bcf50d
--- /dev/null
+++ b/testsuite/surf/trace_A_failure.txt
@@ -0,0 +1,3 @@
+PERIODICITY 10.0
+1.0 -1.0
+2.0 1.0
diff --git a/testsuite/surf/trace_B.txt b/testsuite/surf/trace_B.txt
index 3061526e01..8dc74704d1 100644
--- a/testsuite/surf/trace_B.txt
+++ b/testsuite/surf/trace_B.txt
@@ -1,4 +1,4 @@
-PERIODICITY 10.00
-1.0 10.0
-15.0 2.0
-20.0 8.024
+PERIODICITY 7.00
+0.0 1.0
+11.0 1.0
+30.0 1.0