Title: [158042] branches/safari-537.73-branch/Tools
Diff
Modified: branches/safari-537.73-branch/Tools/ChangeLog (158041 => 158042)
--- branches/safari-537.73-branch/Tools/ChangeLog 2013-10-25 20:35:09 UTC (rev 158041)
+++ branches/safari-537.73-branch/Tools/ChangeLog 2013-10-25 20:35:25 UTC (rev 158042)
@@ -1,5 +1,25 @@
2013-10-25 Lucas Forschler <[email protected]>
+ Merge r157815
+
+ 2013-10-22 Ryosuke Niwa <[email protected]>
+
+ There should be a way to specify additional repository paths in NRWT
+ https://bugs.webkit.org/show_bug.cgi?id=123135
+
+ Reviewed by Alexey Proskuryakov.
+
+ Added --additional-repository-name and --additional-repository-path options to NRWT.
+ These options allow us to submit addtional repository information, such as of Safari's
+ to the new flakiness dashboard.
+
+ * Scripts/webkitpy/layout_tests/run_webkit_tests.py:
+ (parse_args):
+ * Scripts/webkitpy/port/base.py:
+ (Port.repository_paths):
+
+2013-10-25 Lucas Forschler <[email protected]>
+
Merge r157687
2013-10-19 Ryosuke Niwa <[email protected]>
Modified: branches/safari-537.73-branch/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests.py (158041 => 158042)
--- branches/safari-537.73-branch/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests.py 2013-10-25 20:35:09 UTC (rev 158041)
+++ branches/safari-537.73-branch/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests.py 2013-10-25 20:35:25 UTC (rev 158042)
@@ -295,6 +295,10 @@
help=("If specified, upload results json files to this appengine server.")),
optparse.make_option("--results-server-host", default="",
help=("If specified, upload results JSON file to this results server.")),
+ optparse.make_option("--additional-repository-name",
+ help=("The name of an additional subversion or git checkout")),
+ optparse.make_option("--additional-repository-path",
+ help=("The path to an additional subversion or git checkout (requires --additional-repository-name)")),
]))
option_parser = optparse.OptionParser()
Modified: branches/safari-537.73-branch/Tools/Scripts/webkitpy/port/base.py (158041 => 158042)
--- branches/safari-537.73-branch/Tools/Scripts/webkitpy/port/base.py 2013-10-25 20:35:09 UTC (rev 158041)
+++ branches/safari-537.73-branch/Tools/Scripts/webkitpy/port/base.py 2013-10-25 20:35:25 UTC (rev 158042)
@@ -1088,7 +1088,10 @@
# We use LayoutTest directory here because webkit_base isn't a part of WebKit repository in Chromium port
# where turnk isn't checked out as a whole.
- return [('WebKit', self.layout_tests_dir())]
+ repository_paths = [('WebKit', self.layout_tests_dir())]
+ if self.get_option('additional_repository_name') and self.get_option('additional_repository_path'):
+ repository_paths += [(self._options.additional_repository_name, self.path_from_webkit_base(self._options.additional_repository_path))]
+ return repository_paths
_WDIFF_DEL = '##WDIFF_DEL##'
_WDIFF_ADD = '##WDIFF_ADD##'
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
