Commit 3cbe4bfa authored by dpranke@chromium.org's avatar dpranke@chromium.org
Browse files

2011-01-18 Dirk Pranke <dpranke@chromium.org>

        Reviewed by Tony Chang.

        new-run-webkit-tests: add a --build-directory command line argument

        Official Google Chrome builds use a non-standard build directory
        location. This patch adds a --build-directory argument that
        allows that location to be specified on the command line. Only
        Chromium-based builds will use this flag for now, but anyone can
        in the future.

        There are no unit tests for this since it's difficult to test
        until mock filesystems are fully supported in the code. This was
        tested by hand for now.

        https://bugs.webkit.org/show_bug.cgi?id=52694

        * Scripts/webkitpy/layout_tests/port/chromium_linux.py:
        * Scripts/webkitpy/layout_tests/port/chromium_mac.py:
        * Scripts/webkitpy/layout_tests/port/chromium_win.py:
        * Scripts/webkitpy/layout_tests/run_webkit_tests.py:

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@76101 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 6b104b6b
2011-01-18 Dirk Pranke <dpranke@chromium.org>
Reviewed by Tony Chang.
new-run-webkit-tests: add a --build-directory command line argument
Official Google Chrome builds use a non-standard build directory
location. This patch adds a --build-directory argument that
allows that location to be specified on the command line. Only
Chromium-based builds will use this flag for now, but anyone can
in the future.
There are no unit tests for this since it's difficult to test
until mock filesystems are fully supported in the code. This was
tested by hand for now.
https://bugs.webkit.org/show_bug.cgi?id=52694
* Scripts/webkitpy/layout_tests/port/chromium_linux.py:
* Scripts/webkitpy/layout_tests/port/chromium_mac.py:
* Scripts/webkitpy/layout_tests/port/chromium_win.py:
* Scripts/webkitpy/layout_tests/run_webkit_tests.py:
2011-01-18 Maciej Stachowiak <mjs@apple.com>
 
Not reviewed. Bot fix.
......@@ -78,6 +78,10 @@ class ChromiumLinuxPort(chromium.ChromiumPort):
#
def _build_path(self, *comps):
if self.get_option('build_directory'):
return self._filesystem.join(self.get_option('build_directory'),
*comps)
base = self.path_from_chromium_base()
if os.path.exists(os.path.join(base, 'sconsbuild')):
return os.path.join(base, 'sconsbuild', *comps)
......
......@@ -105,6 +105,10 @@ class ChromiumMacPort(chromium.ChromiumPort):
#
def _build_path(self, *comps):
if self.get_option('build_directory'):
return self._filesystem.join(self.get_option('build_directory'),
*comps)
path = self.path_from_chromium_base('xcodebuild', *comps)
if os.path.exists(path) or self.get_option('use_test_shell'):
return path
......
......@@ -106,6 +106,10 @@ class ChromiumWinPort(chromium.ChromiumPort):
# PROTECTED ROUTINES
#
def _build_path(self, *comps):
if self.get_option('build_directory'):
return self._filesystem.join(self.get_option('build_directory'),
*comps)
p = self.path_from_chromium_base('webkit', *comps)
if os.path.exists(p):
return p
......
......@@ -277,6 +277,8 @@ def parse_args(args=None):
default="layout-test-results",
help="Output results directory source dir, relative to Debug or "
"Release"),
optparse.make_option("--build-directory",
help="Path to the directory under which build files are kept (should not include configuration)"),
optparse.make_option("--new-baseline", action="store_true",
default=False, help="Save all generated results as new baselines "
"into the platform directory, overwriting whatever's "
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment