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 661b5f25206a60bc735970534a9876d6bfe561f8..33ab30baf71208cf4f453b383e9132cb1306b75d 100755 (executable)
--- 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");