diff options
| author | jam <jam@chromium.org> | 2014-09-29 18:22:09 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-09-30 01:22:29 +0000 |
| commit | 92ee4a3cbd8284c6f63cf8ca3eed384ca70b939e (patch) | |
| tree | 7f8bfda9936e517b8dcd6d3c25325552f62580e6 /content | |
| parent | 38450201cff7b6de097437ff377ed7183eebd7d0 (diff) | |
| download | chromium_src-92ee4a3cbd8284c6f63cf8ca3eed384ca70b939e.zip chromium_src-92ee4a3cbd8284c6f63cf8ca3eed384ca70b939e.tar.gz chromium_src-92ee4a3cbd8284c6f63cf8ca3eed384ca70b939e.tar.bz2 | |
Pass lsan GYP variable to swarming's test_env so that we can disable the sandbox when it's set.
This copies the logic from tools/build/scripts/slave/runtest.py in swarming.
I changed test_env.py so that it sets CHROME_DEVEL_SANDBOX to be an empty string, instead of unsetting it. The latter doesn't work as Chrome triggers checks in content/browser/browser_main_loop.cc. This is what runtest.py does.
BUG=414808,336218
Review URL: https://codereview.chromium.org/605063004
Cr-Commit-Position: refs/heads/master@{#297330}
Diffstat (limited to 'content')
| -rw-r--r-- | content/content_browsertests.isolate | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/content/content_browsertests.isolate b/content/content_browsertests.isolate index 2d43089..e794b2f 100644 --- a/content/content_browsertests.isolate +++ b/content/content_browsertests.isolate @@ -40,6 +40,7 @@ '<(PRODUCT_DIR)', '<(PRODUCT_DIR)/content_browsertests<(EXECUTABLE_SUFFIX)', '--test-launcher-bot-mode', + '--lsan=<(lsan)', ], 'isolate_dependency_tracked': [ '../testing/xvfb.py', |