Use NSS_DISABLE_UNLOAD in valgrind and heapcheck scripts to avoid unsymbolized backtraces.

BUG=none
TEST=none

Review URL: http://codereview.chromium.org/7003046

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@88408 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 8 insertions, 2 deletions

diff --git a/tools/heapcheck/heapcheck_test.py b/tools/heapcheck/heapcheck_test.py
index 2e86e81..7082f73 100644
--- a/tools/heapcheck/heapcheck_test.py
+++ b/tools/heapcheck/heapcheck_test.py
@@ -1,5 +1,5 @@
 #!/usr/bin/python
-# Copyright (c) 2006-2009 The Chromium Authors. All rights reserved.
+# Copyright (c) 2011 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
@@ -44,6 +44,7 @@ class HeapcheckWrapper(object):
     proc += self._args
     self.PutEnvAndLog('G_SLICE', 'always-malloc')
     self.PutEnvAndLog('NSS_DISABLE_ARENA_FREE_LIST', '1')
+    self.PutEnvAndLog('NSS_DISABLE_UNLOAD', '1')
     self.PutEnvAndLog('GTEST_DEATH_TEST_USE_FORK', '1')
     self.PutEnvAndLog('HEAPCHECK', self._mode)
     self.PutEnvAndLog('HEAP_CHECK_MAX_LEAKS', '-1')
diff --git a/tools/valgrind/valgrind.sh b/tools/valgrind/valgrind.sh
index 2bff755..c7252a2 100755
--- a/tools/valgrind/valgrind.sh
+++ b/tools/valgrind/valgrind.sh
@@ -91,6 +91,8 @@ export VALGRIND_LIB="$CHROME_VALGRIND/lib/valgrind"
 export VALGRIND_LIB_INNER="$CHROME_VALGRIND/lib/valgrind"
 
 # G_SLICE=always-malloc: make glib use system malloc
+# NSS_DISABLE_UNLOAD=1: make nss skip dlclosing dynamically loaded modules,
+# which would result in "obj:*" in backtraces.
 # NSS_DISABLE_ARENA_FREE_LIST=1: make nss use system malloc
 # G_DEBUG=fatal_warnings: make  GTK abort on any critical or warning assertions.
 # If it crashes on you in the Options menu, you hit bug 19751,
@@ -103,6 +105,7 @@ export VALGRIND_LIB_INNER="$CHROME_VALGRIND/lib/valgrind"
 # to ignore possible but not definite leaks.
 
 G_SLICE=always-malloc \
+NSS_DISABLE_UNLOAD=1 \
 NSS_DISABLE_ARENA_FREE_LIST=1 \
 G_DEBUG=fatal_warnings \
 GTEST_DEATH_TEST_USE_FORK=1 \
diff --git a/tools/valgrind/valgrind_test.py b/tools/valgrind/valgrind_test.py
index c847547..c293ee9 100755
--- a/tools/valgrind/valgrind_test.py
+++ b/tools/valgrind/valgrind_test.py
@@ -156,6 +156,7 @@ class BaseTool(object):
 
     add_env = {
       "G_SLICE" : "always-malloc",
+      "NSS_DISABLE_UNLOAD" : "1",
       "NSS_DISABLE_ARENA_FREE_LIST" : "1",
       "GTEST_DEATH_TEST_USE_FORK" : "1",
     }
diff --git a/tools/valgrind/valgrind_webkit_tests.sh b/tools/valgrind/valgrind_webkit_tests.sh
index 63a6f57..ebe87b2 100644
--- a/tools/valgrind/valgrind_webkit_tests.sh
+++ b/tools/valgrind/valgrind_webkit_tests.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright (c) 2009 The Chromium Authors. All rights reserved.
+# Copyright (c) 2011 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
@@ -45,6 +45,7 @@ chmod +x vlayout-wrapper.sh
 rm -f vlayout-*.log
 export BROWSER_WRAPPER=`pwd`/vlayout-wrapper.sh
 export G_SLICE=always-malloc
+export NSS_DISABLE_UNLOAD=1
 export NSS_DISABLE_ARENA_FREE_LIST=1
 sh webkit/tools/layout_tests/run_webkit_tests.sh --run-singly -v --noshow-results --time-out-ms=200000 --nocheck-sys-deps --debug "$@"