Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(281)

Unified Diff: testing/test_env.py

Issue 10808048: Revert r144460 "Remove the linux-only CR_SOURCE_ROOT environment variable override of base::DIR_SOU… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Better Created 8 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « base/base_paths_posix.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: testing/test_env.py
diff --git a/testing/test_env.py b/testing/test_env.py
index 410f812edfb3e0061c2698b9eab73b0f269030d6..1d8bff87af3cea65dffe5e748d450f843edfe7e7 100755
--- a/testing/test_env.py
+++ b/testing/test_env.py
@@ -25,11 +25,15 @@ def fix_python_path(cmd):
def run_executable(cmd, env):
"""Runs an executable with:
+ - environment variable CR_SOURCE_ROOT set to the root directory.
- environment variable LANGUAGE to en_US.UTF-8.
- Reuses sys.executable automatically.
"""
# Many tests assume a English interface...
env['LANGUAGE'] = 'en_US.UTF-8'
+ # Used by base/base_paths_linux.cc as an override. Just make sure the default
+ # logic is used.
+ env.pop('CR_SOURCE_ROOT', None)
# Ensure paths are correctly separated on windows.
cmd[0] = cmd[0].replace('/', os.path.sep)
cmd = fix_python_path(cmd)
« no previous file with comments | « base/base_paths_posix.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698