From: mquinson <mquinson@48e7efb5-ca39-0410-a469-dd3cf9ba447f>
Date: Mon, 2 Jul 2007 14:04:36 +0000 (+0000)
Subject: Make sure that the tests can be run directly with tesh without relying on the Makefil... 
X-Git-Tag: v3.3~1724
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/9e6f6d33ce604eb6dec6de125a2e0eb1056638b6

Make sure that the tests can be run directly with tesh without relying on the Makefile for strange variable settings (but it only works with bash)


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

diff --git a/examples/gras/all2all/test_sg_32 b/examples/gras/all2all/test_sg_32
index a8af3a8caf..9535efa8d0 100755
--- a/examples/gras/all2all/test_sg_32
+++ b/examples/gras/all2all/test_sg_32
@@ -1,4 +1,4 @@
-$ $SG_TEST_EXENV ./all2all_simulator$EXEEXT $srcdir/../../msg/small_platform.xml $srcdir/all2all.xml
+$ $SG_TEST_EXENV ./all2all_simulator$EXEEXT ${srcdir:=.}/../../msg/small_platform.xml ${srcdir:=.}/all2all.xml
 > [Tremblay:sender:(1) 0.000000] [all2all/INFO] Launch current node
 > [Tremblay:receiver:(2) 0.000000] [all2all/INFO] Listening on port 4000 (expecting 4 messages)
 > [Jupiter:sender:(3) 0.000000] [all2all/INFO] Launch current node
diff --git a/examples/gras/all2all/test_sg_64 b/examples/gras/all2all/test_sg_64
index 5487230e67..1fea21594f 100755
--- a/examples/gras/all2all/test_sg_64
+++ b/examples/gras/all2all/test_sg_64
@@ -1,4 +1,4 @@
-$ $SG_TEST_EXENV ./all2all_simulator$EXEEXT $srcdir/../../msg/small_platform.xml $srcdir/all2all.xml
+$ $SG_TEST_EXENV ./all2all_simulator$EXEEXT ${srcdir:=.}/../../msg/small_platform.xml ${srcdir:=.}/all2all.xml
 > [Tremblay:sender:(1) 0.000000] [all2all/INFO] Launch current node
 > [Tremblay:receiver:(2) 0.000000] [all2all/INFO] Listening on port 4000 (expecting 4 messages)
 > [Jupiter:sender:(3) 0.000000] [all2all/INFO] Launch current node
diff --git a/examples/gras/chrono/test_sg_32 b/examples/gras/chrono/test_sg_32
index 849f8c3baf..3e0f53bf5f 100755
--- a/examples/gras/chrono/test_sg_32
+++ b/examples/gras/chrono/test_sg_32
@@ -1,3 +1,3 @@
 
 ! output display
-$ $SG_TEST_EXENV ./chrono_simulator$EXEEXT $srcdir/../../msg/small_platform.xml $srcdir/chrono.xml
+$ $SG_TEST_EXENV ./chrono_simulator$EXEEXT ${srcdir:=.}/../../msg/small_platform.xml ${srcdir:=.}/chrono.xml
diff --git a/examples/gras/chrono/test_sg_64 b/examples/gras/chrono/test_sg_64
index 849f8c3baf..3e0f53bf5f 100755
--- a/examples/gras/chrono/test_sg_64
+++ b/examples/gras/chrono/test_sg_64
@@ -1,3 +1,3 @@
 
 ! output display
-$ $SG_TEST_EXENV ./chrono_simulator$EXEEXT $srcdir/../../msg/small_platform.xml $srcdir/chrono.xml
+$ $SG_TEST_EXENV ./chrono_simulator$EXEEXT ${srcdir:=.}/../../msg/small_platform.xml ${srcdir:=.}/chrono.xml
diff --git a/examples/gras/mmrpc/test_sg_32 b/examples/gras/mmrpc/test_sg_32
index 761a670f1d..97347a8a1c 100755
--- a/examples/gras/mmrpc/test_sg_32
+++ b/examples/gras/mmrpc/test_sg_32
@@ -1,4 +1,4 @@
-$ $SG_TEST_EXENV ./mmrpc_simulator$EXEEXT $srcdir/../../msg/small_platform.xml $srcdir/mmrpc.xml
+$ $SG_TEST_EXENV ./mmrpc_simulator$EXEEXT ${srcdir:=.}/../../msg/small_platform.xml ${srcdir:=.}/mmrpc.xml
 > [Tremblay:server:(1) 0.000000] [MatMult/INFO] Launch server (port=4000)
 > [Fafard:client:(2) 0.000000] [MatMult/INFO] Launch client (server on Tremblay:4000)
 > [Fafard:client:(2) 1.000000] [MatMult/INFO] Connected to Tremblay:4000.
diff --git a/examples/gras/mmrpc/test_sg_64 b/examples/gras/mmrpc/test_sg_64
index ff9a3c323e..4b7154ab5b 100755
--- a/examples/gras/mmrpc/test_sg_64
+++ b/examples/gras/mmrpc/test_sg_64
@@ -1,4 +1,4 @@
-$ $SG_TEST_EXENV ./mmrpc_simulator$EXEEXT $srcdir/../../msg/small_platform.xml $srcdir/mmrpc.xml
+$ $SG_TEST_EXENV ./mmrpc_simulator$EXEEXT ${srcdir:=.}/../../msg/small_platform.xml ${srcdir:=.}/mmrpc.xml
 > [Tremblay:server:(1) 0.000000] [MatMult/INFO] Launch server (port=4000)
 > [Fafard:client:(2) 0.000000] [MatMult/INFO] Launch client (server on Tremblay:4000)
 > [Fafard:client:(2) 1.000000] [MatMult/INFO] Connected to Tremblay:4000.
diff --git a/examples/gras/mutual_exclusion/simple_token/test_sg_32 b/examples/gras/mutual_exclusion/simple_token/test_sg_32
index f5802e2b8b..752400c66c 100755
--- a/examples/gras/mutual_exclusion/simple_token/test_sg_32
+++ b/examples/gras/mutual_exclusion/simple_token/test_sg_32
@@ -1,4 +1,4 @@
-$ $SG_TEST_EXENV ./simple_token_simulator$EXEEXT $srcdir/../../../msg/small_platform.xml $srcdir/simple_token.xml 
+$ $SG_TEST_EXENV ./simple_token_simulator$EXEEXT ${srcdir:=.}/../../../msg/small_platform.xml ${srcdir:=.}/simple_token.xml 
 > [Tremblay:node:(1) 0.000000] [SimpleToken/INFO] Create the token (with value 0) and send it to Fafard:4000
 > [Tremblay:node:(1) 0.011346] [SimpleToken/INFO] Begin a new loop. Still to do: 2
 > [Tremblay:node:(1) 0.022693] [SimpleToken/INFO] Begin a new loop. Still to do: 1
diff --git a/examples/gras/mutual_exclusion/simple_token/test_sg_64 b/examples/gras/mutual_exclusion/simple_token/test_sg_64
index 2f85a827fc..9a017877f0 100755
--- a/examples/gras/mutual_exclusion/simple_token/test_sg_64
+++ b/examples/gras/mutual_exclusion/simple_token/test_sg_64
@@ -1,4 +1,4 @@
-$ $SG_TEST_EXENV ./simple_token_simulator$EXEEXT $srcdir/../../../msg/small_platform.xml $srcdir/simple_token.xml 
+$ $SG_TEST_EXENV ./simple_token_simulator$EXEEXT ${srcdir:=.}/../../../msg/small_platform.xml ${srcdir:=.}/simple_token.xml 
 > [Tremblay:node:(1) 0.000000] [SimpleToken/INFO] Create the token (with value 0) and send it to Fafard:4000
 > [Tremblay:node:(1) 0.011346] [SimpleToken/INFO] Begin a new loop. Still to do: 2
 > [Tremblay:node:(1) 0.022693] [SimpleToken/INFO] Begin a new loop. Still to do: 1
diff --git a/examples/gras/pmm/test_sg_32 b/examples/gras/pmm/test_sg_32
index 4cbf337066..f2a2057e48 100755
--- a/examples/gras/pmm/test_sg_32
+++ b/examples/gras/pmm/test_sg_32
@@ -1,4 +1,4 @@
-$ $SG_TEST_EXENV ./pmm_simulator$EXEEXT $srcdir/../../msg/msg_platform.xml $srcdir/pmm.xml
+$ $SG_TEST_EXENV ./pmm_simulator$EXEEXT ${srcdir:=.}/../../msg/msg_platform.xml ${srcdir:=.}/pmm.xml
 > [Jacquelin:master:(1) 0.000000] [pmm/INFO] Wait for peers for 5 sec
 > [Boivin:slave:(2) 1.000000] [pmm/INFO] Sensor starting (on port 3000)
 > [Jean_Yves:slave:(3) 1.000000] [pmm/INFO] Sensor starting (on port 3000)
diff --git a/examples/gras/pmm/test_sg_64 b/examples/gras/pmm/test_sg_64
index c34567061f..9d0ff26a08 100755
--- a/examples/gras/pmm/test_sg_64
+++ b/examples/gras/pmm/test_sg_64
@@ -1,5 +1,5 @@
 ! timeout 30
-$ $SG_TEST_EXENV ./pmm_simulator$EXEEXT $srcdir/../../msg/msg_platform.xml $srcdir/pmm.xml
+$ $SG_TEST_EXENV ./pmm_simulator$EXEEXT ${srcdir:=.}/../../msg/msg_platform.xml ${srcdir:=.}/pmm.xml
 > [Jacquelin:master:(1) 0.000000] [pmm/INFO] Wait for peers for 5 sec
 > [Boivin:slave:(2) 1.000000] [pmm/INFO] Sensor starting (on port 3000)
 > [Jean_Yves:slave:(3) 1.000000] [pmm/INFO] Sensor starting (on port 3000)
diff --git a/examples/gras/rpc/test_sg_32 b/examples/gras/rpc/test_sg_32
index dc52ac1b97..ce0b2fd464 100755
--- a/examples/gras/rpc/test_sg_32
+++ b/examples/gras/rpc/test_sg_32
@@ -1,4 +1,4 @@
-$ $SG_TEST_EXENV ./rpc_simulator$EXEEXT $srcdir/../../msg/small_platform.xml $srcdir/rpc.xml --log=root.fmt:"'[%h:%t:(%i) %.2r] [%c/%p] %m%n'"
+$ $SG_TEST_EXENV ./rpc_simulator$EXEEXT ${srcdir:=.}/../../msg/small_platform.xml ${srcdir:=.}/rpc.xml --log=root.fmt:"'[%h:%t:(%i) %.2r] [%c/%p] %m%n'"
 > [Tremblay:server:(1) 0.00] [Rpc/INFO] Launch server (port=4000)
 > [Tremblay:server:(1) 0.00] [Rpc/INFO] Listening on port 4000
 > [Ginette:forwarder:(2) 0.00] [Rpc/INFO] Launch forwarder (port=4000)
diff --git a/examples/gras/rpc/test_sg_64 b/examples/gras/rpc/test_sg_64
index 39a2a4902f..dc1aacba22 100755
--- a/examples/gras/rpc/test_sg_64
+++ b/examples/gras/rpc/test_sg_64
@@ -1,4 +1,4 @@
-$ $SG_TEST_EXENV ./rpc_simulator$EXEEXT $srcdir/../../msg/small_platform.xml $srcdir/rpc.xml --log=root.fmt:"'[%h:%t:(%i) %.2r] [%c/%p] %m%n'"
+$ $SG_TEST_EXENV ./rpc_simulator$EXEEXT ${srcdir:=.}/../../msg/small_platform.xml ${srcdir:=.}/rpc.xml --log=root.fmt:"'[%h:%t:(%i) %.2r] [%c/%p] %m%n'"
 > [Tremblay:server:(1) 0.00] [Rpc/INFO] Launch server (port=4000)
 > [Tremblay:server:(1) 0.00] [Rpc/INFO] Listening on port 4000
 > [Ginette:forwarder:(2) 0.00] [Rpc/INFO] Launch forwarder (port=4000)
diff --git a/examples/gras/timer/test_sg_32 b/examples/gras/timer/test_sg_32
index b9596f432e..c3785a64fb 100755
--- a/examples/gras/timer/test_sg_32
+++ b/examples/gras/timer/test_sg_32
@@ -1,5 +1,5 @@
 
-$ $SG_TEST_EXENV ./timer_simulator$EXEEXT $srcdir/../../msg/small_platform.xml $srcdir/timer.xml
+$ $SG_TEST_EXENV ./timer_simulator$EXEEXT ${srcdir:=.}/../../msg/small_platform.xml ${srcdir:=.}/timer.xml
 > [Fafard:client:(1) 0.000000] [test/INFO] Programming the repetitive_action with a frequency of 1.000000 sec
 > [Fafard:client:(1) 0.000000] [test/INFO] Programming the delayed_action for after 2.000000 sec
 > [Fafard:client:(1) 0.000000] [test/INFO] Have a rest
diff --git a/examples/gras/timer/test_sg_64 b/examples/gras/timer/test_sg_64
index b9596f432e..c3785a64fb 100755
--- a/examples/gras/timer/test_sg_64
+++ b/examples/gras/timer/test_sg_64
@@ -1,5 +1,5 @@
 
-$ $SG_TEST_EXENV ./timer_simulator$EXEEXT $srcdir/../../msg/small_platform.xml $srcdir/timer.xml
+$ $SG_TEST_EXENV ./timer_simulator$EXEEXT ${srcdir:=.}/../../msg/small_platform.xml ${srcdir:=.}/timer.xml
 > [Fafard:client:(1) 0.000000] [test/INFO] Programming the repetitive_action with a frequency of 1.000000 sec
 > [Fafard:client:(1) 0.000000] [test/INFO] Programming the delayed_action for after 2.000000 sec
 > [Fafard:client:(1) 0.000000] [test/INFO] Have a rest