Title: [231206] trunk/Tools
- Revision
- 231206
- Author
- ross.kirsl...@sony.com
- Date
- 2018-05-01 12:57:28 -0700 (Tue, 01 May 2018)
Log Message
[WinCairo] Align buildbot test stages with AppleWin.
https://bugs.webkit.org/show_bug.cgi?id=185094
Reviewed by Brent Fulgham.
* BuildSlaveSupport/build.webkit.org-config/factories.py:
(TestFactory.__init__):
Do run API tests, don't run dashboard tests.
* BuildSlaveSupport/build.webkit.org-config/steps.py:
(RunUnitTests):
Call run-api-tests with Python, not Perl (bugfix for r230998).
* Scripts/webkitpy/port/win.py:
(WinPort.environment_for_api_tests):
Retrieve necessary Windows environment variables.
Modified Paths
Diff
Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/factories.py (231205 => 231206)
--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/factories.py 2018-05-01 19:57:17 UTC (rev 231205)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/factories.py 2018-05-01 19:57:28 UTC (rev 231206)
@@ -80,13 +80,13 @@
if self.LayoutTestClass:
self.addStep(self.LayoutTestClass())
- if platform == 'win' or platform.startswith('mac') or platform.startswith('ios-simulator'):
+ if platform.startswith('win') or platform.startswith('mac') or platform.startswith('ios-simulator'):
self.addStep(RunUnitTests())
self.addStep(RunPythonTests())
self.addStep(RunPerlTests())
self.addStep(RunBindingsTests())
self.addStep(RunBuiltinsTests())
- if platform != 'win':
+ if not platform.startswith('win'):
self.addStep(RunDashboardTests())
if self.LayoutTestClass:
self.addStep(ArchiveTestResults())
Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/steps.py (231205 => 231206)
--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/steps.py 2018-05-01 19:57:17 UTC (rev 231205)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/steps.py 2018-05-01 19:57:28 UTC (rev 231206)
@@ -489,7 +489,7 @@
name = "run-api-tests"
description = ["unit tests running"]
descriptionDone = ["unit-tests"]
- command = ["perl", "./Tools/Scripts/run-api-tests", "--no-build", WithProperties("--%(configuration)s"), "--verbose"]
+ command = ["python", "./Tools/Scripts/run-api-tests", "--no-build", WithProperties("--%(configuration)s"), "--verbose"]
failedTestsFormatString = "%d unit test%s failed or timed out"
def start(self):
Modified: trunk/Tools/ChangeLog (231205 => 231206)
--- trunk/Tools/ChangeLog 2018-05-01 19:57:17 UTC (rev 231205)
+++ trunk/Tools/ChangeLog 2018-05-01 19:57:28 UTC (rev 231206)
@@ -1,3 +1,22 @@
+2018-05-01 Ross Kirsling <ross.kirsl...@sony.com>
+
+ [WinCairo] Align buildbot test stages with AppleWin.
+ https://bugs.webkit.org/show_bug.cgi?id=185094
+
+ Reviewed by Brent Fulgham.
+
+ * BuildSlaveSupport/build.webkit.org-config/factories.py:
+ (TestFactory.__init__):
+ Do run API tests, don't run dashboard tests.
+
+ * BuildSlaveSupport/build.webkit.org-config/steps.py:
+ (RunUnitTests):
+ Call run-api-tests with Python, not Perl (bugfix for r230998).
+
+ * Scripts/webkitpy/port/win.py:
+ (WinPort.environment_for_api_tests):
+ Retrieve necessary Windows environment variables.
+
2018-05-01 Eric Carlson <eric.carl...@apple.com>
[MediaStream] remove WK1 support
Modified: trunk/Tools/Scripts/webkitpy/port/win.py (231205 => 231206)
--- trunk/Tools/Scripts/webkitpy/port/win.py 2018-05-01 19:57:17 UTC (rev 231205)
+++ trunk/Tools/Scripts/webkitpy/port/win.py 2018-05-01 19:57:28 UTC (rev 231206)
@@ -137,6 +137,12 @@
env['XML_CATALOG_FILES'] = '' # work around missing /etc/catalog <rdar://problem/4292995>
return env
+ def environment_for_api_tests(self):
+ env = super(WinPort, self).environment_for_api_tests()
+ for variable in ['SYSTEMROOT', 'WEBKIT_LIBRARIES']:
+ self._copy_value_from_environ_if_set(env, variable)
+ return env
+
def operating_system(self):
return 'win'
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
