diff options
| author | thomaslewis@google.com <thomaslewis@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-15 17:26:03 +0000 |
|---|---|---|
| committer | thomaslewis@google.com <thomaslewis@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-15 17:26:03 +0000 |
| commit | 912a59afa6f473674e6b746363004a641e993ab2 (patch) | |
| tree | 38ae046433e642afaaaf2d890f68641dfae5cc7a /o3d/tests/build.scons | |
| parent | 80256e3936a6fd07902e82c8442ad83425873a7f (diff) | |
| download | chromium_src-912a59afa6f473674e6b746363004a641e993ab2.zip chromium_src-912a59afa6f473674e6b746363004a641e993ab2.tar.gz chromium_src-912a59afa6f473674e6b746363004a641e993ab2.tar.bz2 | |
Update the archiving for Hive runs to work from Buildbot. Remove deadlock from Selenium tests if no free ports are available.
Review URL: http://codereview.chromium.org/149596
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@20741 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'o3d/tests/build.scons')
| -rw-r--r-- | o3d/tests/build.scons | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/o3d/tests/build.scons b/o3d/tests/build.scons index 0780cad..67fdd1d 100644 --- a/o3d/tests/build.scons +++ b/o3d/tests/build.scons @@ -672,7 +672,7 @@ if env.AnyBits('mac', 'windows'): # Pull in all pulse related environment variables. for k in os.environ: - if k.startswith('PULSE_'): + if k.startswith('PULSE_') or k == 'BUILD_NUMBER': selenium_env['ENV'][k] = os.environ[k] selenium_env['PREP_SELENIUM_ARCHIVE'] = ( @@ -687,12 +687,14 @@ if env.AnyBits('mac', 'windows'): selenium_env['PREP_SELENIUM_ARCHIVE_NAME'] = 'O3Dtests_mac' selenium_env['GNU_SETUP_EXTRAS'] = '' selenium_env['SETUP_SCRIPTS'] = ( - 'export PYTHONPATH=' + env.Dir('$MAIN_DIR/scripts').abspath) + # PYTHONPATH env needed to import python modules used on Buildbot. + 'export PYTHONPATH=' + os.environ.get('PYTHONPATH', '')) else: selenium_env['PREP_SELENIUM_ARCHIVE_NAME'] = 'O3Dtests' selenium_env['GNU_SETUP_EXTRAS'] = r'..\o3d-internal\third_party\gnu\setup_env.bat && ' + # PYTHONPATH env needed to import python modules used on Buildbot. selenium_env['SETUP_SCRIPTS'] = ( - 'set PYTHONPATH=' + env.Dir('$MAIN_DIR/scripts').abspath) + 'set PYTHONPATH=' + os.environ.get('PYTHONPATH', '')) selenium_env['ENV']['DXSDK_DIR'] = os.environ.get('DXSDK_DIR', '') |