From e6c54a4ad37108531aab134519e60f77dfebf939 Mon Sep 17 00:00:00 2001 From: earthdok Date: Thu, 16 Oct 2014 11:02:36 -0700 Subject: [PATCH] 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} --- testing/test_env.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/testing/test_env.py b/testing/test_env.py index 0539309fd59c..574aaed880ea 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' -- 2.11.4.GIT