summaryrefslogtreecommitdiffstats
path: root/testing
diff options
context:
space:
mode:
authorearthdok <earthdok@chromium.org>2014-10-16 11:02:36 -0700
committerCommit bot <commit-bot@chromium.org>2014-10-16 18:03:17 +0000
commite6c54a4ad37108531aab134519e60f77dfebf939 (patch)
treeaffca989602bd903c2cb7844e47e2f981d74de85 /testing
parent4fe114e79020c97813df6d36dfb156b834749126 (diff)
downloadchromium_src-e6c54a4ad37108531aab134519e60f77dfebf939.zip
chromium_src-e6c54a4ad37108531aab134519e60f77dfebf939.tar.gz
chromium_src-e6c54a4ad37108531aab134519e60f77dfebf939.tar.bz2
Pass G_SLICE=always-malloc to swarmed ASan tasks.
This was blocked on http://crbug.com/423873 which is now fixed. BUG=414808 R=jam@chromium.org Review URL: https://codereview.chromium.org/645033003 Cr-Commit-Position: refs/heads/master@{#299927}
Diffstat (limited to 'testing')
-rwxr-xr-xtesting/test_env.py5
1 files changed, 1 insertions, 4 deletions
diff --git a/testing/test_env.py b/testing/test_env.py
index 0539309..574aaed 100755
--- a/testing/test_env.py
+++ b/testing/test_env.py
@@ -81,10 +81,7 @@ def get_asan_env(cmd, lsan):
extra_env = {}
# Instruct GTK to use malloc while running ASan or LSan tests.
- # TODO(earthdok): enabling G_SLICE gives these leaks, locally and on swarming
- #0 0x62c01b in __interceptor_malloc (/tmp/run_tha_testXukBDT/out/Release/browser_tests+0x62c01b)
- #1 0x7fb64ab64a38 in g_malloc /build/buildd/glib2.0-2.32.4/./glib/gmem.c:159
- #extra_env['G_SLICE'] = 'always-malloc'
+ extra_env['G_SLICE'] = 'always-malloc'
extra_env['NSS_DISABLE_ARENA_FREE_LIST'] = '1'
extra_env['NSS_DISABLE_UNLOAD'] = '1'