summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorthomaslewis@google.com <thomaslewis@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-06-09 17:50:06 +0000
committerthomaslewis@google.com <thomaslewis@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-06-09 17:50:06 +0000
commitb4b2fd09168f3af8dd89b7cbb58f47dc8d573f4f (patch)
tree9656e32e8baef27371c0b0e4b43548f3e802d2a8
parentcd5749d607e9edec80d648723360aa1e8ef181c1 (diff)
downloadchromium_src-b4b2fd09168f3af8dd89b7cbb58f47dc8d573f4f.zip
chromium_src-b4b2fd09168f3af8dd89b7cbb58f47dc8d573f4f.tar.gz
chromium_src-b4b2fd09168f3af8dd89b7cbb58f47dc8d573f4f.tar.bz2
Fix QA code to work from svn.
Review URL: http://codereview.chromium.org/118442 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@17958 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--o3d/tests/build.scons6
1 files changed, 4 insertions, 2 deletions
diff --git a/o3d/tests/build.scons b/o3d/tests/build.scons
index c6b41a9..ba271ab 100644
--- a/o3d/tests/build.scons
+++ b/o3d/tests/build.scons
@@ -640,14 +640,16 @@ if env.AnyBits('mac', 'windows'):
'export PYTHONPATH=' + env.Dir('$MAIN_DIR/scripts').abspath)
else:
selenium_env['PREP_SELENIUM_ARCHIVE_NAME'] = 'O3Dtests'
- selenium_env['GNU_SETUP_EXTRAS'] = r'..\third_party\gnu\setup_env.bat && '
+ selenium_env['GNU_SETUP_EXTRAS'] = r'..\o3d-internal\third_party\gnu\setup_env.bat && '
selenium_env['SETUP_SCRIPTS'] = (
'set PYTHONPATH=' + env.Dir('$MAIN_DIR/scripts').abspath)
+ selenium_env['ENV']['DXSDK_DIR'] = os.environ['DXSDK_DIR']
+
selenium_env.AlwaysBuild(selenium_env.Alias('prep_selenium', [],
[Delete('$TARGET_ROOT/${PREP_SELENIUM_ARCHIVE_NAME}'),
'$SETUP_SCRIPTS && '
- 'cd tests && cd lab_automation && ' +
+ 'cd ..\o3d-internal && cd tests && cd lab_automation && ' +
sys.executable + ' prepare_selenium_tests.py '
'$TARGET_ROOT/${PREP_SELENIUM_ARCHIVE_NAME}',
Delete('$PREP_SELENIUM_ARCHIVE'),