From: Nicholas Nethercote <njn@valgrind.org>
Date: Sat, 12 Nov 2005 16:08:09 +0000 (+0000)
Subject: Make regtests work with --enable-inner.
X-Git-Tag: svn/VALGRIND_3_1_0~134
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e72b808c98c50ea1bad94331ce3371469caaf00e;p=thirdparty%2Fvalgrind.git

Make regtests work with --enable-inner.



git-svn-id: svn://svn.valgrind.org/valgrind/trunk@5098
---

diff --git a/tests/vg_regtest.in b/tests/vg_regtest.in
index 661b5f2520..33ab30baf7 100755
--- a/tests/vg_regtest.in
+++ b/tests/vg_regtest.in
@@ -278,9 +278,14 @@ sub do_one_test($$)
     printf("%-16s valgrind $vgopts $prog $args\n", "$name:");
 
     # Pass the appropriate --tool option for the directory (can be overridden
-    # by an "args:" line, though).  
+    # by an "args:" line, though).  Set both VALGRIND_LIB and
+    # VALGRIND_LIB_INNER in case this Valgrind was configured with
+    # --enable-inner.
     my $tool=determine_tool();
-    mysystem("VALGRIND_LIB=$tests_dir/.in_place $valgrind --command-line-only=yes --memcheck:leak-check=no --addrcheck:leak-check=no --tool=$tool $vgopts $prog $args > $name.stdout.out 2> $name.stderr.out");
+    mysystem("VALGRIND_LIB=$tests_dir/.in_place VALGRIND_LIB_INNER=$tests_dir/.in_place "
+           . "$valgrind --command-line-only=yes --memcheck:leak-check=no "
+           . "--addrcheck:leak-check=no --tool=$tool $vgopts "
+           . "$prog $args > $name.stdout.out 2> $name.stderr.out");
 
     if (defined $stdout_filter) {
         mysystem("$stdout_filter < $name.stdout.out > $tmp");