A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Messages which the payload datatype descriptor is NULL contain 0 bytes as payload...
[simgrid.git]
/
testsuite
/
run_tests.in
diff --git
a/testsuite/run_tests.in
b/testsuite/run_tests.in
index
0ab4b12
..
27fcd51
100755
(executable)
--- a/
testsuite/run_tests.in
+++ b/
testsuite/run_tests.in
@@
-10,28
+10,34
@@
tests_nb=0
rm -f test.failed test.success test.ignored
rm -f test.failed test.success test.ignored
-# Work around a libtool issue on solaris
-export LD_LIBRARY_PATH=@top_srcdir@/src/.libs
+# Work around a libtool issue on solaris, making sure that it works even on sh older than tcsh
+LD_LIBRARY_PATH=@top_srcdir@/src/.libs
+if export LD_LIBRARY_PATH ; then
+ :
+else
+ setenv LD_LIBRARY_PATH @top_srcdir@/src/.libs
+fi
##
## Args parsing (simplistic for now)
##
if [ xvalgrind = "x$1" ] ; then
##
## Args parsing (simplistic for now)
##
if [ xvalgrind = "x$1" ] ; then
-
valgrind
="libtool --mode=execute valgrind --show-reachable=yes"
+
exenv
="libtool --mode=execute valgrind --show-reachable=yes"
else
else
-
valgrind
=
+
exenv
=
fi
##
## Tests defintions
##
fi
##
## Tests defintions
##
-xbt_TESTS=" xbt/log_usage@EXEEXT@; \
+xbt_TESTS=" xbt/ex_test@EXEEXT@; \
+ xbt/log_usage@EXEEXT@; \
xbt/dynar_int@EXEEXT@; \
xbt/dynar_double@EXEEXT@; \
xbt/dynar_string@EXEEXT@; \
xbt/dict_usage@EXEEXT@; \
xbt/dict_crash@EXEEXT@; \
xbt/dynar_int@EXEEXT@; \
xbt/dynar_double@EXEEXT@; \
xbt/dynar_string@EXEEXT@; \
xbt/dict_usage@EXEEXT@; \
xbt/dict_crash@EXEEXT@; \
- xbt/multdict_crash@EXEEXT@; \
+ xbt/mult
i
dict_crash@EXEEXT@; \
xbt/config_usage@EXEEXT@; \
xbt/heap_bench@EXEEXT@;"
xbt/config_usage@EXEEXT@; \
xbt/heap_bench@EXEEXT@;"
@@
-79,33
+85,35
@@
do
tests_nb=`expr $tests_nb + 1`
echo "#### Test $test"
tests_nb=`expr $tests_nb + 1`
echo "#### Test $test"
- if [ x@EXEEXT@ = x ] ; then
- wine=
+ if [ x@EXEEXT@ = x ] ; then
+ :
else
else
- wine=wine
+ # overwrites "valgrind" as a value, but should be exclusive.
+ exenv=wine
fi
fi
- if [ "x$test" = "xdict_crash@EXEEXT@" ] ; then
- $wine ./$test --xbt-log="root.thres=info" 2>&1
+ exenvsave=$exenv
+ if [ "x$test" = "xxbt/dict_crash@EXEEXT@" ] ; then
+ if echo $exenv | grep valgrind >/dev/null ; then
+ exenv=
+ fi
+ $exenv ./$test --xbt-log="root.thres=info" 2>&1
retval=$?
else
retval=$?
else
- winesave=$wine
- if [ x@EXEEXT@ != x ] ; then
+ if [ x@EXEEXT@ != x ] && [ x$exenv = xwine ] ; then
if echo ${test} | grep @EXEEXT@ >/dev/null ; then : ; else
if echo ${test} | grep @EXEEXT@ >/dev/null ; then : ; else
-# echo "This is not a win32 binary, don't use wine"
- wine=""
+ exenv=""
fi
fi
fi
fi
- # if the user defines valgrind while cross-compiling, too bad
- $wine $valgrind ./$test --xbt-log="root.thres=info" 2>&1
- retval=$?
- wine=$winesave
+ $exenv ./$test --xbt-log="root.thres=info" 2>&1
+ retval=$?
fi
fi
+ exenv=$exenvsave
if [ $retval != 0 ] ; then if [ $retval != 77 ]; then
echo "## failed" # . Rerun $test with full details."
# if [ "x$test" = "xdict_crash" ] ; then
if [ $retval != 0 ] ; then if [ $retval != 77 ]; then
echo "## failed" # . Rerun $test with full details."
# if [ "x$test" = "xdict_crash" ] ; then
-# $
wine
./$test --xbt-log="root.thres=debug" 2>&1
+# $
exenv
./$test --xbt-log="root.thres=debug" 2>&1
# else
# else
-# $
wine $valgrind
./$test --xbt-log="root.thres=debug" 2>&1
+# $
exenv
./$test --xbt-log="root.thres=debug" 2>&1
# fi
failed_nb=`expr $failed_nb + 1`
echo " $test (returned $retval)" >> test.failed
# fi
failed_nb=`expr $failed_nb + 1`
echo " $test (returned $retval)" >> test.failed