From 96267bbb3b9e564d04ef25f02fc0674dec2e17ad Mon Sep 17 00:00:00 2001
From: mquinson <mquinson@48e7efb5-ca39-0410-a469-dd3cf9ba447f>
Date: Tue, 18 Aug 2009 14:25:53 +0000
Subject: [PATCH] More fixes to VPATH testing

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@6596 48e7efb5-ca39-0410-a469-dd3cf9ba447f
---
 examples/smpi/bcast.tesh                      |  6 +-
 examples/smpi/reduce.tesh                     |  6 +-
 .../simdag/platforms/basic_parsing_test.tesh  | 83 +++++--------------
 3 files changed, 27 insertions(+), 68 deletions(-)

diff --git a/examples/smpi/bcast.tesh b/examples/smpi/bcast.tesh
index fa2ff3491b..74f4da56c7 100644
--- a/examples/smpi/bcast.tesh
+++ b/examples/smpi/bcast.tesh
@@ -4,7 +4,7 @@
 
 # Go for the first test
 p Test Broadcast with less processes than hosts
-$ ../../src/smpi/smpirun -map -hostfile hostfile -platform ../msg/small_platform.xml -np 3 ./bcast -q
+$ ../../src/smpi/smpirun -map -hostfile ${srcdir:=.}/hostfile -platform ${srcdir:=.}/../msg/small_platform.xml -np 3 ./bcast -q
 > [rank 0] -> Tremblay
 > [rank 1] -> Jupiter
 > [rank 2] -> Fafard
@@ -20,7 +20,7 @@ $ ../../src/smpi/smpirun -map -hostfile hostfile -platform ../msg/small_platform
 # second test
 p Test Broadcast with as much processes than hosts
 ! setenv LD_LIBRARY_PATH=../../src/.libs
-$ ../../src/smpi/smpirun -map -hostfile hostfile -platform ../msg/small_platform.xml -np 6 ./bcast -q
+$ ../../src/smpi/smpirun -map -hostfile ${srcdir:=.}/hostfile -platform ${srcdir:=.}/../msg/small_platform.xml -np 6 ./bcast -q
 > [rank 0] -> Tremblay
 > [rank 1] -> Jupiter
 > [rank 2] -> Fafard
@@ -44,7 +44,7 @@ $ ../../src/smpi/smpirun -map -hostfile hostfile -platform ../msg/small_platform
 # Another test
 p Test Broadcast with more processes than hosts
 ! setenv LD_LIBRARY_PATH=../../src/.libs
-$ ../../src/smpi/smpirun -map -hostfile hostfile -platform ../msg/small_platform.xml -np 12 ./bcast -q
+$ ../../src/smpi/smpirun -map -hostfile ${srcdir:=.}/hostfile -platform ${srcdir:=.}/../msg/small_platform.xml -np 12 ./bcast -q
 > [rank 0] -> Tremblay
 > [rank 1] -> Jupiter
 > [rank 2] -> Fafard
diff --git a/examples/smpi/reduce.tesh b/examples/smpi/reduce.tesh
index 859de0a1c7..4d4b767a14 100644
--- a/examples/smpi/reduce.tesh
+++ b/examples/smpi/reduce.tesh
@@ -4,7 +4,7 @@
 
 # Go for the first test
 p Test Reduce with 3 processes 
-$ ../../src/smpi/smpirun -map -hostfile hostfile -platform ../msg/small_platform.xml -np 3 ./reduce 
+$ ../../src/smpi/smpirun -map -hostfile ${srcdir:=.}/hostfile -platform ${srcdir:=.}/../msg/small_platform.xml -np 3 ./reduce 
 > [rank 0] -> Tremblay
 > [rank 1] -> Jupiter
 > [rank 2] -> Fafard
@@ -24,7 +24,7 @@ $ ../../src/smpi/smpirun -map -hostfile hostfile -platform ../msg/small_platform
 # second test
 ! setenv LD_LIBRARY_PATH=../../src/.libs
 p Test Reduce with 6 processes 
-$ ../../src/smpi/smpirun -map -hostfile hostfile -platform ../msg/small_platform.xml -np 6 ./reduce 
+$ ../../src/smpi/smpirun -map -hostfile ${srcdir:=.}/hostfile -platform ${srcdir:=.}/../msg/small_platform.xml -np 6 ./reduce 
 > [rank 0] -> Tremblay
 > [rank 1] -> Jupiter
 > [rank 2] -> Fafard
@@ -54,7 +54,7 @@ $ ../../src/smpi/smpirun -map -hostfile hostfile -platform ../msg/small_platform
 # third test
 ! setenv LD_LIBRARY_PATH=../../src/.libs
 p Test Reduce with 12 processes 
-$ ../../src/smpi/smpirun -map -hostfile hostfile -platform ../msg/small_platform.xml -np 12 ./reduce 
+$ ../../src/smpi/smpirun -map -hostfile ${srcdir:=.}/hostfile -platform ${srcdir:=.}/../msg/small_platform.xml -np 12 ./reduce 
 > [rank 0] -> Tremblay
 > [rank 1] -> Jupiter
 > [rank 2] -> Fafard
diff --git a/teshsuite/simdag/platforms/basic_parsing_test.tesh b/teshsuite/simdag/platforms/basic_parsing_test.tesh
index 0f87495121..7f6f5e9334 100644
--- a/teshsuite/simdag/platforms/basic_parsing_test.tesh
+++ b/teshsuite/simdag/platforms/basic_parsing_test.tesh
@@ -1,62 +1,21 @@
-$ simdag/platforms/basic_parsing_test --cfg=path:${srcdir:=.}/simdag/platforms one_cluster_foreach.xml
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'path' to './simdag/platforms'
-
-$ simdag/platforms/basic_parsing_test --cfg=path:${srcdir:=.}/simdag/platforms one_cluster_one_host_random.xml
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'path' to './simdag/platforms'
-
-$ simdag/platforms/basic_parsing_test --cfg=path:${srcdir:=.}/simdag/platforms one_cluster_one_host.xml
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'path' to './simdag/platforms'
-
-$ simdag/platforms/basic_parsing_test --cfg=path:${srcdir:=.}/simdag/platforms one_cluster_properties_foreach.xml
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'path' to './simdag/platforms'
-
-$ simdag/platforms/basic_parsing_test --cfg=path:${srcdir:=.}/simdag/platforms one_cluster.xml
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'path' to './simdag/platforms'
-
-$ simdag/platforms/basic_parsing_test --cfg=path:${srcdir:=.}/simdag/platforms one_host_availability.xml
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'path' to './simdag/platforms'
-
-$ simdag/platforms/basic_parsing_test --cfg=path:${srcdir:=.}/simdag/platforms one_host_properties.xml
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'path' to './simdag/platforms'
-
-$ simdag/platforms/basic_parsing_test --cfg=path:${srcdir:=.}/simdag/platforms one_host_state_file.xml
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'path' to './simdag/platforms'
-
-$ simdag/platforms/basic_parsing_test --cfg=path:${srcdir:=.}/simdag/platforms one_host_state_off.xml
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'path' to './simdag/platforms'
-
-$ simdag/platforms/basic_parsing_test --cfg=path:${srcdir:=.}/simdag/platforms one_host_state_on.xml
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'path' to './simdag/platforms'
-
-$ simdag/platforms/basic_parsing_test --cfg=path:${srcdir:=.}/simdag/platforms one_host_trace_inside.xml
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'path' to './simdag/platforms'
-
-$ simdag/platforms/basic_parsing_test --cfg=path:${srcdir:=.}/simdag/platforms one_host.xml
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'path' to './simdag/platforms'
-
-$ simdag/platforms/basic_parsing_test --cfg=path:${srcdir:=.}/simdag/platforms one_link_availability.xml
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'path' to './simdag/platforms'
-
-$ simdag/platforms/basic_parsing_test --cfg=path:${srcdir:=.}/simdag/platforms one_link_fatpipe.xml
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'path' to './simdag/platforms'
-
-$ simdag/platforms/basic_parsing_test --cfg=path:${srcdir:=.}/simdag/platforms one_link_shared.xml
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'path' to './simdag/platforms'
-
-$ simdag/platforms/basic_parsing_test --cfg=path:${srcdir:=.}/simdag/platforms one_link_state_file.xml
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'path' to './simdag/platforms'
-
-$ simdag/platforms/basic_parsing_test --cfg=path:${srcdir:=.}/simdag/platforms three_hosts_non_symmetric_route.xml
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'path' to './simdag/platforms'
-
-$ simdag/platforms/basic_parsing_test --cfg=path:${srcdir:=.}/simdag/platforms two_clusters_symmetric.xml
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'path' to './simdag/platforms'
-
-$ simdag/platforms/basic_parsing_test --cfg=path:${srcdir:=.}/simdag/platforms two_clusters.xml
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'path' to './simdag/platforms'
-
-$ simdag/platforms/basic_parsing_test --cfg=path:${srcdir:=.}/simdag/platforms two_hosts_multi_hop.xml
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'path' to './simdag/platforms'
-
-$ simdag/platforms/basic_parsing_test --cfg=path:${srcdir:=.}/simdag/platforms two_hosts_one_link.xml
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'path' to './simdag/platforms'
+$ simdag/platforms/basic_parsing_test --log=xbt_cfg.thres:critical --cfg=path:${srcdir:=.}/simdag/platforms one_cluster_foreach.xml
+$ simdag/platforms/basic_parsing_test --log=xbt_cfg.thres:critical --cfg=path:${srcdir:=.}/simdag/platforms one_cluster_one_host_random.xml
+$ simdag/platforms/basic_parsing_test --log=xbt_cfg.thres:critical --cfg=path:${srcdir:=.}/simdag/platforms one_cluster_one_host.xml
+$ simdag/platforms/basic_parsing_test --log=xbt_cfg.thres:critical --cfg=path:${srcdir:=.}/simdag/platforms one_cluster_properties_foreach.xml
+$ simdag/platforms/basic_parsing_test --log=xbt_cfg.thres:critical --cfg=path:${srcdir:=.}/simdag/platforms one_cluster.xml
+$ simdag/platforms/basic_parsing_test --log=xbt_cfg.thres:critical --cfg=path:${srcdir:=.}/simdag/platforms one_host_availability.xml
+$ simdag/platforms/basic_parsing_test --log=xbt_cfg.thres:critical --cfg=path:${srcdir:=.}/simdag/platforms one_host_properties.xml
+$ simdag/platforms/basic_parsing_test --log=xbt_cfg.thres:critical --cfg=path:${srcdir:=.}/simdag/platforms one_host_state_file.xml
+$ simdag/platforms/basic_parsing_test --log=xbt_cfg.thres:critical --cfg=path:${srcdir:=.}/simdag/platforms one_host_state_off.xml
+$ simdag/platforms/basic_parsing_test --log=xbt_cfg.thres:critical --cfg=path:${srcdir:=.}/simdag/platforms one_host_state_on.xml
+$ simdag/platforms/basic_parsing_test --log=xbt_cfg.thres:critical --cfg=path:${srcdir:=.}/simdag/platforms one_host_trace_inside.xml
+$ simdag/platforms/basic_parsing_test --log=xbt_cfg.thres:critical --cfg=path:${srcdir:=.}/simdag/platforms one_host.xml
+$ simdag/platforms/basic_parsing_test --log=xbt_cfg.thres:critical --cfg=path:${srcdir:=.}/simdag/platforms one_link_availability.xml
+$ simdag/platforms/basic_parsing_test --log=xbt_cfg.thres:critical --cfg=path:${srcdir:=.}/simdag/platforms one_link_fatpipe.xml
+$ simdag/platforms/basic_parsing_test --log=xbt_cfg.thres:critical --cfg=path:${srcdir:=.}/simdag/platforms one_link_shared.xml
+$ simdag/platforms/basic_parsing_test --log=xbt_cfg.thres:critical --cfg=path:${srcdir:=.}/simdag/platforms one_link_state_file.xml
+$ simdag/platforms/basic_parsing_test --log=xbt_cfg.thres:critical --cfg=path:${srcdir:=.}/simdag/platforms three_hosts_non_symmetric_route.xml
+$ simdag/platforms/basic_parsing_test --log=xbt_cfg.thres:critical --cfg=path:${srcdir:=.}/simdag/platforms two_clusters_symmetric.xml
+$ simdag/platforms/basic_parsing_test --log=xbt_cfg.thres:critical --cfg=path:${srcdir:=.}/simdag/platforms two_clusters.xml
+$ simdag/platforms/basic_parsing_test --log=xbt_cfg.thres:critical --cfg=path:${srcdir:=.}/simdag/platforms two_hosts_multi_hop.xml
+$ simdag/platforms/basic_parsing_test --log=xbt_cfg.thres:critical --cfg=path:${srcdir:=.}/simdag/platforms two_hosts_one_link.xml
-- 
2.20.1