summaryrefslogtreecommitdiffstats
path: root/o3d
diff options
context:
space:
mode:
authorpetersont@chromium.org <petersont@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-06-09 23:58:25 +0000
committerpetersont@chromium.org <petersont@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-06-09 23:58:25 +0000
commit1c73a27a512a9b9d0b82284a688a6cbf13a0adea (patch)
tree1f274c2e5043fa344f65c924b420871a15a4dbf6 /o3d
parentec237916c8ab3b352de0f1bc88078ddc57a2fba2 (diff)
downloadchromium_src-1c73a27a512a9b9d0b82284a688a6cbf13a0adea.zip
chromium_src-1c73a27a512a9b9d0b82284a688a6cbf13a0adea.tar.gz
chromium_src-1c73a27a512a9b9d0b82284a688a6cbf13a0adea.tar.bz2
Review URL: http://codereview.chromium.org/118473
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@17998 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'o3d')
-rw-r--r--o3d/tests/build.scons5
1 files changed, 4 insertions, 1 deletions
diff --git a/o3d/tests/build.scons b/o3d/tests/build.scons
index ba271ab..0af1c95 100644
--- a/o3d/tests/build.scons
+++ b/o3d/tests/build.scons
@@ -644,7 +644,10 @@ if env.AnyBits('mac', 'windows'):
selenium_env['SETUP_SCRIPTS'] = (
'set PYTHONPATH=' + env.Dir('$MAIN_DIR/scripts').abspath)
- selenium_env['ENV']['DXSDK_DIR'] = os.environ['DXSDK_DIR']
+ try:
+ selenium_env['ENV']['DXSDK_DIR'] = os.environ['DXSDK_DIR']
+ except KeyError:
+ selenium_env['ENV']['DXSDK_DIR'] = ''
selenium_env.AlwaysBuild(selenium_env.Alias('prep_selenium', [],
[Delete('$TARGET_ROOT/${PREP_SELENIUM_ARCHIVE_NAME}'),