diff options
| author | bradnelson@google.com <bradnelson@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-10 04:01:46 +0000 |
|---|---|---|
| committer | bradnelson@google.com <bradnelson@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-10 04:01:46 +0000 |
| commit | cb291574610d4c9bf2c2bf04a4dd9463dd777a20 (patch) | |
| tree | 2433555a5247ddce7069d472a380ae30cc708163 /o3d | |
| parent | 8a8648364cc55ddb32ec5a77deee13862e3ca363 (diff) | |
| download | chromium_src-cb291574610d4c9bf2c2bf04a4dd9463dd777a20.zip chromium_src-cb291574610d4c9bf2c2bf04a4dd9463dd777a20.tar.gz chromium_src-cb291574610d4c9bf2c2bf04a4dd9463dd777a20.tar.bz2 | |
Changing an access on os.environ to a get (so things don't complain on
mac/linux if DXSDK_DIR is not set).
Review URL: http://codereview.chromium.org/119388
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@18025 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'o3d')
| -rw-r--r-- | o3d/tests/build.scons | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/o3d/tests/build.scons b/o3d/tests/build.scons index 0af1c95..8bfde29 100644 --- a/o3d/tests/build.scons +++ b/o3d/tests/build.scons @@ -644,10 +644,7 @@ if env.AnyBits('mac', 'windows'): selenium_env['SETUP_SCRIPTS'] = ( 'set PYTHONPATH=' + env.Dir('$MAIN_DIR/scripts').abspath) - try: - selenium_env['ENV']['DXSDK_DIR'] = os.environ['DXSDK_DIR'] - except KeyError: - selenium_env['ENV']['DXSDK_DIR'] = '' + selenium_env['ENV']['DXSDK_DIR'] = os.environ.get('DXSDK_DIR', '') selenium_env.AlwaysBuild(selenium_env.Alias('prep_selenium', [], [Delete('$TARGET_ROOT/${PREP_SELENIUM_ARCHIVE_NAME}'), |