diff options
| author | yukawa@chromium.org <yukawa@chromium.org@78cadc50-ecff-11dd-a971-7dbc132099af> | 2014-06-12 13:25:40 +0000 |
|---|---|---|
| committer | yukawa@chromium.org <yukawa@chromium.org@78cadc50-ecff-11dd-a971-7dbc132099af> | 2014-06-12 13:25:40 +0000 |
| commit | f6d25e9ca24aa0aab73ff2679d05b17116782816 (patch) | |
| tree | f1d6395f6e60f74072b57ddf32569591d32278f7 | |
| parent | e97dbe88f23bd8bcbd83478f0a2e7d6e6f17e351 (diff) | |
| download | gyp-f6d25e9ca24aa0aab73ff2679d05b17116782816.tar.gz | |
Use context manager to manage OS environment in tests
This is a follow up CL for gyp r1931, just for the code cleanup. Inspired by Nico's gyp r1893.
BUG=gyp:434
TEST=unittest
R=scottmg@chromium.org
Review URL: https://codereview.chromium.org/321183002
git-svn-id: http://gyp.googlecode.com/svn/trunk@1934 78cadc50-ecff-11dd-a971-7dbc132099af
| -rw-r--r-- | test/make_global_settings/ar/gyptest-make_global_settings_ar.py | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/test/make_global_settings/ar/gyptest-make_global_settings_ar.py b/test/make_global_settings/ar/gyptest-make_global_settings_ar.py index 7b3da341..a62bb2d1 100644 --- a/test/make_global_settings/ar/gyptest-make_global_settings_ar.py +++ b/test/make_global_settings/ar/gyptest-make_global_settings_ar.py @@ -101,13 +101,9 @@ if test.format == 'make': # Test $AR and $AR_host environment variables. -try: - os.environ['AR'] = 'my_ar_target2' - os.environ['AR_host'] = 'my_ar_host2' +with TestGyp.LocalEnv({'AR': 'my_ar_target2', + 'AR_host': 'my_ar_host2'}): test.run_gyp('make_global_settings_ar.gyp') -finally: - del os.environ['AR'] - del os.environ['AR_host'] # Ninja generator resolves $AR in gyp phase. Make generator doesn't. if test.format == 'ninja': if sys.platform == 'win32': @@ -119,12 +115,9 @@ verify_ar_host(test, ar='my_ar_host2', rel_path=False) # Test 'AR' in 'make_global_settings' with $AR_host environment variable. -try: - os.environ['AR_host'] = 'my_ar_host3' +with TestGyp.LocalEnv({'AR_host': 'my_ar_host3'}): test.run_gyp('make_global_settings_ar.gyp', '-Dcustom_ar_target=my_ar_target3') -finally: - del os.environ['AR_host'] # TODO(yukawa): Support 'AR' in Ninja generator if test.format == 'make': verify_ar_target(test, ar='my_ar_target3', rel_path=True) |