Uniformize the test_{sg,rl} scripts, rename the wine variable to exenv (excution...

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 8bbdec4..cf6e5c7 100755 (executable)
--- 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 110ab6d..2237ee5 100755 (executable)
--- 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 09e5469..db4d47e 100755 (executable)
--- 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 18dbc80..4f67277 100755 (executable)
--- 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 dfb8871..6969e0f 100755 (executable)
--- 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 878af47..d381ced 100755 (executable)
--- 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 efa6f1c..d04f283 100755 (executable)
--- 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 33a57fa..9a5130e 100644 (file)
--- 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 $@