diff options
Diffstat (limited to 'tools/valgrind/valgrind_test.py')
| -rw-r--r-- | tools/valgrind/valgrind_test.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/tools/valgrind/valgrind_test.py b/tools/valgrind/valgrind_test.py index e45b2e4..e68918cd 100644 --- a/tools/valgrind/valgrind_test.py +++ b/tools/valgrind/valgrind_test.py @@ -390,6 +390,12 @@ class ValgrindTool(BaseTool): # The Valgrind command is constructed. + # Valgrind doesn't play nice with the Chrome sandbox. Empty this env var + # set by runtest.py to disable the sandbox. + if os.environ.get("CHROME_DEVEL_SANDBOX", None): + logging.info("Removing CHROME_DEVEL_SANDBOX fron environment") + os.environ["CHROME_DEVEL_SANDBOX"] = '' + # Handle --indirect_webkit_layout separately. if self._options.indirect_webkit_layout: # Need to create the wrapper before modifying |proc|. @@ -399,12 +405,6 @@ class ValgrindTool(BaseTool): proc.append(wrapper) return proc - # Valgrind doesn't play nice with the Chrome sandbox. Empty this env var - # set by runtest.py to disable the sandbox. - if os.environ.get("CHROME_DEVEL_SANDBOX", None): - logging.info("Removing CHROME_DEVEL_SANDBOX fron environment") - os.environ["CHROME_DEVEL_SANDBOX"] = '' - if self._options.indirect: wrapper = self.CreateBrowserWrapper(proc) os.environ["BROWSER_WRAPPER"] = wrapper |