From 58d9227184fb51af98700ece9235f69d26f2db6a Mon Sep 17 00:00:00 2001 From: mquinson Date: Mon, 5 Jul 2004 23:12:54 +0000 Subject: [PATCH] add a valgrind target to the makefile, but not for the dict_crash since it takes for ever if we do run it under valgrind git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@165 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- testsuite/Makefile.am | 3 ++- testsuite/run_tests.in | 17 +++++++++++++++-- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/testsuite/Makefile.am b/testsuite/Makefile.am index 096b5afab7..72e1fa58ac 100644 --- a/testsuite/Makefile.am +++ b/testsuite/Makefile.am @@ -28,7 +28,8 @@ TESTS=run_tests test: $(noinst_PROGRAMS) $(noinst_SCRIPTS) ./run_tests - +valgrind: $(noinst_PROGRAMS) $(noinst_SCRIPTS) + ./run_tests valgrind # LDADD_UTILS is still a separate var to distinguish core tester from RL tester LDADD_UTILS=$(top_srcdir)/src/base/libgrasrl.a diff --git a/testsuite/run_tests.in b/testsuite/run_tests.in index f2fdbde128..9cd50d3d3b 100755 --- a/testsuite/run_tests.in +++ b/testsuite/run_tests.in @@ -2,6 +2,11 @@ failed_nb=0 success_nb=0 tests_nb=0 +if [ xvalgrind = "x$1" ] ; then + valgrind=valgrind +else + valgrind= +fi for test in log_usage \ dynar_int dynar_double dynar_string \ dict_usage dict_crash \ @@ -11,10 +16,18 @@ for test in log_usage \ do tests_nb=`expr $tests_nb + 1` echo "#### Test $test" - ./$test --gras-log="root.thres=info" 2>&1 + if [ "x$test" = "xdict_crash" ] ; then + ./$test --gras-log="root.thres=info" 2>&1 + else + $valgrind ./$test --gras-log="root.thres=info" 2>&1 + fi if [ $? != 0 ] ; then echo "## failed. Rerun $test with full details." - ./$test --gras-log="root.thres=debug" 2>&1 + if [ "x$test" = "xdict_crash" ] ; then + ./$test --gras-log="root.thres=debug" 2>&1 + else + $valgrind ./$test --gras-log="root.thres=debug" 2>&1 + fi failed_nb=`expr $failed_nb + 1` failed="$failed $test" else -- 2.20.1