moving basic tests + revalidating tesh files.

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

diff --git a/teshsuite/Makefile.am b/teshsuite/Makefile.am
index 0dfcf65..b62532c 100644 (file)
--- a/teshsuite/Makefile.am
+++ b/teshsuite/Makefile.am
@@ -104,36 +104,35 @@ TESTS += \
   simdag/network/test_reinit_costs.tesh
 
 # from L.C. Canon
-noinst_PROGRAMS += simdag/canon/sd_test0 \
-                   simdag/canon/sd_test1 \
-                   simdag/canon/sd_test2 \
-                   simdag/canon/sd_test3 \
-                   simdag/canon/sd_test4 \
-                   simdag/canon/sd_test5
-
-EXTRA_DIST      += simdag/canon/input_platform.xml
-
-simdag_canon_sd_test0_SOURCES = simdag/canon/sd_test0.c
-simdag_canon_sd_test0_LDADD = $(LDADD_SG)
-simdag_canon_sd_test1_SOURCES = simdag/canon/sd_test1.c
-simdag_canon_sd_test1_LDADD = $(LDADD_SG)
-simdag_canon_sd_test2_SOURCES = simdag/canon/sd_test2.c
-simdag_canon_sd_test2_LDADD = $(LDADD_SG)
-simdag_canon_sd_test3_SOURCES = simdag/canon/sd_test3.c
-simdag_canon_sd_test3_LDADD = $(LDADD_SG)
-simdag_canon_sd_test4_SOURCES = simdag/canon/sd_test4.c
-simdag_canon_sd_test4_LDADD = $(LDADD_SG)
-simdag_canon_sd_test5_SOURCES = simdag/canon/sd_test5.c
-simdag_canon_sd_test5_LDADD = $(LDADD_SG)
+noinst_PROGRAMS += simdag/basic0 \
+                   simdag/basic1 \
+                   simdag/basic2 \
+                   simdag/basic3 \
+                   simdag/basic4 \
+                   simdag/basic5
+
+EXTRA_DIST      += simdag/basic_platform.xml
+
+simdag_basic0_SOURCES = simdag/basic0.c
+simdag_basic0_LDADD = $(LDADD_SG)
+simdag_basic1_SOURCES = simdag/basic1.c
+simdag_basic1_LDADD = $(LDADD_SG)
+simdag_basic2_SOURCES = simdag/basic2.c
+simdag_basic2_LDADD = $(LDADD_SG)
+simdag_basic3_SOURCES = simdag/basic3.c
+simdag_basic3_LDADD = $(LDADD_SG)
+simdag_basic4_SOURCES = simdag/basic4.c
+simdag_basic4_LDADD = $(LDADD_SG)
+simdag_basic5_SOURCES = simdag/basic5.c
+simdag_basic5_LDADD = $(LDADD_SG)
 
 TESTS += \
-  simdag/canon/sd_test0.tesh 
-# \
-#   simdag/canon/sd_test1.tesh \
-#   simdag/canon/sd_test2.tesh \
-#   simdag/canon/sd_test3.tesh \
-#   simdag/canon/sd_test4.tesh \
-#   simdag/canon/sd_test5.tesh
+  simdag/basic0.tesh  \
+  simdag/basic1.tesh \
+  simdag/basic2.tesh \
+  simdag/basic3.tesh \
+  simdag/basic4.tesh \
+  simdag/basic5.tesh
 
 # p2p
 

diff --git a/teshsuite/simdag/canon/sd_test0.c b/teshsuite/simdag/basic0.c
similarity index 100%
rename from teshsuite/simdag/canon/sd_test0.c
rename to teshsuite/simdag/basic0.c

diff --git a/teshsuite/simdag/canon/sd_test0.tesh b/teshsuite/simdag/basic0.tesh
similarity index 88%
rename from teshsuite/simdag/canon/sd_test0.tesh
rename to teshsuite/simdag/basic0.tesh
index 4f13732..542a786 100644 (file)
--- a/teshsuite/simdag/canon/sd_test0.tesh
+++ b/teshsuite/simdag/basic0.tesh
@@ -1,4 +1,4 @@
-$ simdag/canon/sd_test0 simdag/canon/input_platform.xml
+$ simdag/basic0 simdag/basic_platform.xml
 > [0.000000] [sd_kernel/INFO] Starting simulation...
 > [0.000000] [sd_kernel/INFO] Executing task '(null)'
 > [0.000100] [sd_kernel/INFO] Task '(null)' done

diff --git a/teshsuite/simdag/canon/sd_test1.c b/teshsuite/simdag/basic1.c
similarity index 100%
rename from teshsuite/simdag/canon/sd_test1.c
rename to teshsuite/simdag/basic1.c

diff --git a/teshsuite/simdag/canon/sd_test1.tesh b/teshsuite/simdag/basic1.tesh
similarity index 88%
rename from teshsuite/simdag/canon/sd_test1.tesh
rename to teshsuite/simdag/basic1.tesh
index 1a1c890..2fb7378 100644 (file)
--- a/teshsuite/simdag/canon/sd_test1.tesh
+++ b/teshsuite/simdag/basic1.tesh
@@ -1,4 +1,4 @@
-$ simdag/canon/sd_test1 simdag/canon/input_platform.xml
+$ simdag/basic1 simdag/basic_platform.xml
 > [0.000000] [sd_kernel/INFO] Starting simulation...
 > [0.000000] [sd_kernel/INFO] Executing task '(null)'
 > [0.000000] [sd_kernel/INFO] Task '(null)' done

diff --git a/teshsuite/simdag/canon/sd_test2.c b/teshsuite/simdag/basic2.c
similarity index 100%
rename from teshsuite/simdag/canon/sd_test2.c
rename to teshsuite/simdag/basic2.c

diff --git a/teshsuite/simdag/canon/sd_test2.tesh b/teshsuite/simdag/basic2.tesh
similarity index 88%
rename from teshsuite/simdag/canon/sd_test2.tesh
rename to teshsuite/simdag/basic2.tesh
index 77e7e0a..393187e 100644 (file)
--- a/teshsuite/simdag/canon/sd_test2.tesh
+++ b/teshsuite/simdag/basic2.tesh
@@ -1,4 +1,4 @@
-$ simdag/canon/sd_test2 simdag/canon/input_platform.xml
+$ simdag/basic2 simdag/basic_platform.xml
 > [0.000000] [sd_kernel/INFO] Starting simulation...
 > [0.000000] [sd_kernel/INFO] Executing task '(null)'
 > [0.000000] [sd_kernel/INFO] Task '(null)' done

diff --git a/teshsuite/simdag/canon/sd_test3.c b/teshsuite/simdag/basic3.c
similarity index 100%
rename from teshsuite/simdag/canon/sd_test3.c
rename to teshsuite/simdag/basic3.c

diff --git a/teshsuite/simdag/canon/sd_test3.tesh b/teshsuite/simdag/basic3.tesh
similarity index 88%
rename from teshsuite/simdag/canon/sd_test3.tesh
rename to teshsuite/simdag/basic3.tesh
index a081c47..67e62d4 100644 (file)
--- a/teshsuite/simdag/canon/sd_test3.tesh
+++ b/teshsuite/simdag/basic3.tesh
@@ -1,4 +1,4 @@
-$ simdag/canon/sd_test3 simdag/canon/input_platform.xml
+$ simdag/basic3 simdag/basic_platform.xml
 > [0.000000] [sd_kernel/INFO] Starting simulation...
 > [0.000000] [sd_kernel/INFO] Executing task 'Task Init'
 > [0.000000] [sd_kernel/INFO] Task 'Task Init' done

diff --git a/teshsuite/simdag/canon/sd_test4.c b/teshsuite/simdag/basic4.c
similarity index 100%
rename from teshsuite/simdag/canon/sd_test4.c
rename to teshsuite/simdag/basic4.c

diff --git a/teshsuite/simdag/canon/sd_test4.tesh b/teshsuite/simdag/basic4.tesh
similarity index 67%
rename from teshsuite/simdag/canon/sd_test4.tesh
rename to teshsuite/simdag/basic4.tesh
index 46d46d7..151f7a1 100644 (file)
--- a/teshsuite/simdag/canon/sd_test4.tesh
+++ b/teshsuite/simdag/basic4.tesh
@@ -1,9 +1,9 @@
-$ simdag/canon/sd_test4 simdag/canon/input_platform.xml
+$ simdag/basic4 simdag/basic_platform.xml
 > [0.000000] [sd_kernel/INFO] Starting simulation...
 > [0.000000] [sd_kernel/INFO] Executing task 'Task Init'
 > [0.000000] [sd_kernel/INFO] Task 'Task Init' done
 > [0.000000] [sd_kernel/INFO] Executing task 'Task A'
 > [0.000100] [sd_kernel/INFO] Task 'Task A' done
 > [0.000100] [sd_kernel/INFO] Executing task 'Task Fin'
-> [1.000100] [sd_kernel/INFO] Task 'Task Fin' done
-> [1.000100] [sd_kernel/INFO] Simulation finished
+> [0.000100] [sd_kernel/INFO] Task 'Task Fin' done
+> [0.000100] [sd_kernel/INFO] Simulation finished

diff --git a/teshsuite/simdag/canon/sd_test5.c b/teshsuite/simdag/basic5.c
similarity index 100%
rename from teshsuite/simdag/canon/sd_test5.c
rename to teshsuite/simdag/basic5.c

diff --git a/teshsuite/simdag/canon/sd_test5.tesh b/teshsuite/simdag/basic5.tesh
similarity index 88%
rename from teshsuite/simdag/canon/sd_test5.tesh
rename to teshsuite/simdag/basic5.tesh
index dc223fb..336c24d 100644 (file)
--- a/teshsuite/simdag/canon/sd_test5.tesh
+++ b/teshsuite/simdag/basic5.tesh
@@ -1,4 +1,4 @@
-$ simdag/canon/sd_test5 simdag/canon/input_platform.xml
+$ simdag/basic5 simdag/basic_platform.xml
 > [0.000000] [sd_kernel/INFO] Starting simulation...
 > [0.000000] [sd_kernel/INFO] Executing task 'Task Init'
 > [0.000000] [sd_kernel/INFO] Task 'Task Init' done

diff --git a/teshsuite/simdag/canon/input_platform.xml b/teshsuite/simdag/basic_platform.xml
similarity index 100%
rename from teshsuite/simdag/canon/input_platform.xml
rename to teshsuite/simdag/basic_platform.xml