From: mquinson <mquinson@48e7efb5-ca39-0410-a469-dd3cf9ba447f>
Date: Sun, 7 Aug 2005 19:48:56 +0000 (+0000)
Subject: Uniformize the test_{sg,rl} scripts, rename the wine variable to exenv (excution... 
X-Git-Tag: v3.3~3729
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/9410fb7986e9bc4a63c490a004cee1ca32dda9bb

Uniformize the test_{sg,rl} scripts, rename the wine variable to exenv (excution environment) so that people don't think we try to run wine when it's defined to '', make sure we can control the exenv from the environment by setting the SG_TEST_EXENV environment variable (to run everythin within valgrind, for example)


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

diff --git a/examples/gras/chrono/test_rl.in b/examples/gras/chrono/test_rl.in
index 8bbdec455b..cf6e5c7ca4 100755
--- a/examples/gras/chrono/test_rl.in
+++ b/examples/gras/chrono/test_rl.in
@@ -1,8 +1,8 @@
 #! @BASH@ -e
 if [ x@EXEEXT@ = x ] ; then 
-  wine=
+  exenv=$SG_TEST_EXENV
 else
-  wine=wine
+  exenv=wine
 fi
     
-exec $wine ./chrono_multiplier@EXEEXT@ $@
+exec $exenv ./chrono_multiplier@EXEEXT@ $@
diff --git a/examples/gras/chrono/test_sg.in b/examples/gras/chrono/test_sg.in
index 110ab6d524..2237ee54fd 100755
--- a/examples/gras/chrono/test_sg.in
+++ b/examples/gras/chrono/test_sg.in
@@ -1,5 +1,8 @@
 #! @BASH@
-if test -x ./chrono_simulator ; then
-  exec ./chrono_simulator @top_srcdir@/examples/msg/small_platform.xml @srcdir@/chrono_deployment.xml
+if [ x@EXEEXT@ = x ] ; then 
+  exenv=$SG_TEST_EXENV
+else
+  exenv=wine
 fi
-exit 77
+
+exec $exenv ./chrono_simulator@EXEEXT@ @top_srcdir@/examples/msg/small_platform.xml @srcdir@/chrono_deployment.xml
diff --git a/examples/gras/ping/test_sg.in b/examples/gras/ping/test_sg.in
index 09e54699c1..db4d47eb18 100755
--- a/examples/gras/ping/test_sg.in
+++ b/examples/gras/ping/test_sg.in
@@ -1,6 +1,6 @@
 #! @BASH@
 if [ x@EXEEXT@ = x ] ; then 
-  exenv=
+  exenv=$SG_TEST_EXENV
 else
   exenv=wine
 fi
diff --git a/examples/gras/timer/test_rl.in b/examples/gras/timer/test_rl.in
index 18dbc803f3..4f67277ed5 100755
--- a/examples/gras/timer/test_rl.in
+++ b/examples/gras/timer/test_rl.in
@@ -1,8 +1,8 @@
 #! @BASH@ -e
 if [ x@EXEEXT@ = x ] ; then 
-  wine=
+  exenv=$SG_TEST_EXENV
 else
-  wine=wine
+  exenv=wine
 fi
     
-exec $wine ./timer_client@EXEEXT@ 
+exec $exenv ./timer_client@EXEEXT@ 
diff --git a/examples/gras/timer/test_sg.in b/examples/gras/timer/test_sg.in
index dfb8871cc3..6969e0f94f 100755
--- a/examples/gras/timer/test_sg.in
+++ b/examples/gras/timer/test_sg.in
@@ -1,5 +1,8 @@
 #! @BASH@
-if test -x ./timer_simulator ; then
-  exec ./timer_simulator @top_srcdir@/examples/msg/small_platform.xml @srcdir@/timer_deployment.xml $@
+if [ x@EXEEXT@ = x ] ; then
+  exenv=$SG_TEST_EXENV
+else
+  exenv=wine
 fi
-exit 77
+
+exec $exenv ./timer_simulator@EXEEXT@ @top_srcdir@/examples/msg/small_platform.xml @srcdir@/timer_deployment.xml $@
diff --git a/examples/gras/tokenS/test_rl.in b/examples/gras/tokenS/test_rl.in
index 878af47c94..d381ced127 100755
--- a/examples/gras/tokenS/test_rl.in
+++ b/examples/gras/tokenS/test_rl.in
@@ -2,7 +2,7 @@
 if [ x@EXEEXT@ = x ] ; then 
 #  exenv="libtool --mode=execute valgrind --db-attach=yes --run-libc-freeres=no "
 #  exenv="libtool --mode=execute valgrind --run-libc-freeres=no "
-  exenv=
+  exenv=$SG_TEST_EXENV
 else
   exenv=wine
 fi
diff --git a/examples/gras/tokenS/test_sg.in b/examples/gras/tokenS/test_sg.in
index efa6f1ce5e..d04f283fde 100755
--- a/examples/gras/tokenS/test_sg.in
+++ b/examples/gras/tokenS/test_sg.in
@@ -1,7 +1,7 @@
 #! @BASH@
 if [ x@EXEEXT@ = x ] ; then 
 #  exenv="libtool --mode=execute valgrind --run-libc-freeres=no --show-reachable=yes "
-  exenv=
+  exenv=$SG_TEST_EXENV
 else
   exenv=wine
 fi
diff --git a/examples/msg/run_msg_test.in b/examples/msg/run_msg_test.in
index 33a57fa660..9a5130e570 100644
--- a/examples/msg/run_msg_test.in
+++ b/examples/msg/run_msg_test.in
@@ -1,9 +1,9 @@
 #! @BASH@ -e
 if [ x@EXEEXT@ = x ] ; then 
-  wine=
+  exenv=$SG_TEST_EXENV
 else
-  wine=wine
+  exenv=wine
 fi
     
-$wine ./msg_test@EXEEXT@ @srcdir@/msg_platform.xml @srcdir@/msg_deployment.xml $@
-$wine ./msg_test@EXEEXT@ @srcdir@/small_platform.xml @srcdir@/small_deployment.xml $@
+$exenv ./msg_test@EXEEXT@ @srcdir@/msg_platform.xml @srcdir@/msg_deployment.xml $@
+$exenv ./msg_test@EXEEXT@ @srcdir@/small_platform.xml @srcdir@/small_deployment.xml $@