Add missing outer argument when self-hosting valgrind.

The outer valgrind tries to run libc and libcxx free res functions
in the guest (which in case of self-hosting is a valgrind tool).
And that fails.

So, disable running such free res functions.

diff --git a/perf/vg_perf.in b/perf/vg_perf.in
index d3e8ce9270e5c25b2631d93125e48121df7c0f68..a55e227326f844c464673a17a619cec2d8dc7011 100644 (file)
--- a/perf/vg_perf.in
+++ b/perf/vg_perf.in
@@ -335,7 +335,8 @@ sub do_one_test($$)
             if ((not defined $outer_args) || ($outer_args =~ /^\+/)) {
                 $run_outer_args = 
                       " -v --command-line-only=yes"
-                    . " --run-libc-freeres=no --sim-hints=enable-outer"
+                    . " --sim-hints=enable-outer"
+                    . " --run-libc-freeres=no --run-cxx-freeres=no"
                     . " --smc-check=all-non-file"
                     . " --vgdb=no --trace-children=yes --read-var-info=no"
                     . " --suppressions=../tests/outer_inner.supp"

diff --git a/tests/vg_regtest.in b/tests/vg_regtest.in
index 2c323f9ed6c82185b1e13151a857ca0acd8580a9..f03416e50028c9c14bcf49e14e29c28b89b0c140 100755 (executable)
--- a/tests/vg_regtest.in
+++ b/tests/vg_regtest.in
@@ -261,7 +261,8 @@ sub process_command_line()
       if ((not defined $outer_args)  || ($outer_args =~ /^\+/)) {
           $run_outer_args = 
                 " --command-line-only=yes"
-              . " --run-libc-freeres=no --sim-hints=enable-outer"
+              . " --sim-hints=enable-outer"
+              . " --run-libc-freeres=no --run-cxx-freeres=no"
               . " --smc-check=all-non-file"
               . " --vgdb=no --trace-children=yes --read-var-info=no"
               . " --read-inline-info=yes"