From 92ee4a3cbd8284c6f63cf8ca3eed384ca70b939e Mon Sep 17 00:00:00 2001
From: jam <jam@chromium.org>
Date: Mon, 29 Sep 2014 18:22:09 -0700
Subject: 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}
---
 chrome/interactive_ui_tests.isolate | 1 +
 1 file changed, 1 insertion(+)

(limited to 'chrome/interactive_ui_tests.isolate')

diff --git a/chrome/interactive_ui_tests.isolate b/chrome/interactive_ui_tests.isolate
index 34f9e37..04f6cc2 100644
--- a/chrome/interactive_ui_tests.isolate
+++ b/chrome/interactive_ui_tests.isolate
@@ -10,6 +10,7 @@
           '<(PRODUCT_DIR)',
           '<(PRODUCT_DIR)/interactive_ui_tests<(EXECUTABLE_SUFFIX)',
           '--test-launcher-bot-mode',
+          '--lsan=<(lsan)',
         ],
         'isolate_dependency_tracked': [
           '../testing/xvfb.py',
-- 
cgit v1.1