diff options
Diffstat (limited to 'tools/valgrind')
-rwxr-xr-x | tools/valgrind/valgrind.sh | 6 | ||||
-rwxr-xr-x | tools/valgrind/valgrind_test.py | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/tools/valgrind/valgrind.sh b/tools/valgrind/valgrind.sh index ebc1098..ea17afd 100755 --- a/tools/valgrind/valgrind.sh +++ b/tools/valgrind/valgrind.sh @@ -97,9 +97,7 @@ set -x # If it crashes on you in the Options menu, you hit bug 19751, # comment out the G_DEBUG=fatal_warnings line. # -# --smc-check=all: handle v8's dynamic code generation. -# (though we can probably remove that now that v8 is annotated). -# --trace-children to follow into the renderer processes. +# GTEST_DEATH_TEST_USE_FORK=1: make gtest death tests valgrind-friendly # # When everyone has the latest valgrind, we might want to add # --show-possible=no @@ -108,10 +106,10 @@ set -x G_SLICE=always-malloc \ NSS_DISABLE_ARENA_FREE_LIST=1 \ G_DEBUG=fatal_warnings \ +GTEST_DEATH_TEST_USE_FORK=1 \ valgrind \ --tool=$TOOL_NAME \ --trace-children=yes \ --suppressions="$SUPPRESSIONS" \ - --smc-check=all \ "${DEFAULT_TOOL_FLAGS[@]}" \ "$@" diff --git a/tools/valgrind/valgrind_test.py b/tools/valgrind/valgrind_test.py index 40ecde1..bdbdd0c 100755 --- a/tools/valgrind/valgrind_test.py +++ b/tools/valgrind/valgrind_test.py @@ -257,6 +257,8 @@ class ValgrindTool(object): logging.info("export G_SLICE=always-malloc"); os.putenv("NSS_DISABLE_ARENA_FREE_LIST", "1") logging.info("export NSS_DISABLE_ARENA_FREE_LIST=1"); + os.putenv("GTEST_DEATH_TEST_USE_FORK", "1") + logging.info("export GTEST_DEATH_TEST_USE_FORK=1"); common.RunSubprocess(proc, self._timeout) |