diff options
| author | maruel@chromium.org <maruel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-26 20:53:56 +0000 |
|---|---|---|
| committer | maruel@chromium.org <maruel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-26 20:53:56 +0000 |
| commit | 3766ed1ca06a9a561c57085c8f8d276dea9b974e (patch) | |
| tree | d6dc9e9fda410df6c17c0a3bf19f7ac362b88047 /testing | |
| parent | e72cb5ad2429598121b245e8eab1410876bfa3ea (diff) | |
| download | chromium_src-3766ed1ca06a9a561c57085c8f8d276dea9b974e.zip chromium_src-3766ed1ca06a9a561c57085c8f8d276dea9b974e.tar.gz chromium_src-3766ed1ca06a9a561c57085c8f8d276dea9b974e.tar.bz2 | |
Revert r144460 "Remove the linux-only CR_SOURCE_ROOT environment variable override of base::DIR_SOURCE_ROOT."
CR_SOURCE_ROOT is used in practice by linux user(s), plural still to be
determined, mostly for ChromeOS related development.
R=willchan@chromium.org
BUG=
TEST=
Review URL: https://chromiumcodereview.appspot.com/10808048
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@148621 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'testing')
| -rwxr-xr-x | testing/test_env.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/testing/test_env.py b/testing/test_env.py index 410f812..1d8bff8 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) |