Diff
Modified: trunk/Tools/CISupport/build-webkit-org/htdigestparser_unittest.py (269119 => 269120)
--- trunk/Tools/CISupport/build.webkit.org-config/htdigestparser_unittest.py 2020-10-28 20:28:00 UTC (rev 269119)
+++ trunk/Tools/CISupport/build-webkit-org/htdigestparser_unittest.py 2020-10-28 20:39:42 UTC (rev 269120)
@@ -87,10 +87,6 @@
""")
-# FIXME: We should run this file as part of test-rm .
-# Unfortunately test-rm currently requires that unittests
-# be located in a directory with a valid module name.
-# 'build.webkit.org-config' is not a valid module name (due to '.' and '-')
-# so for now this is a stand-alone test harness.
+# FIXME: We should run this file as part of test-webkitpy
if __name__ == '__main__':
unittest.main()
Modified: trunk/Tools/CISupport/build-webkit-org/public_html/TestFailures/scripts/builders_unittests.js (269119 => 269120)
--- trunk/Tools/CISupport/build.webkit.org-config/public_html/TestFailures/scripts/builders_unittests.js 2020-10-28 20:28:00 UTC (rev 269119)
+++ trunk/Tools/CISupport/build-webkit-org/public_html/TestFailures/scripts/builders_unittests.js 2020-10-28 20:39:42 UTC (rev 269120)
@@ -90,7 +90,7 @@
var kExampleBuildInfoJSON = {
"blame": ["[email protected]"],
"builderName": "WebKit Linux",
- "changes": ["Files:\n Tools/CISupport/build.webkit.org-config/public_html/TestFailures/main.js\n Tools/ChangeLog\nAt: Thu 04 Aug 2011 00:50:38\nChanged By: [email protected]\nComments: Fix types. Sadly, main.js has no test coverage. (I need to think\nabout how to test this part of the code.)\n\n* CISupport/build.webkit.org-config/public_html/TestFailures/main.js:Properties: \n\n\n", "Files:\n LayoutTests/ChangeLog\n LayoutTests/platform/chromium-mac/fast/box-shadow/inset-box-shadows-expected.png\n LayoutTests/platform/chromium-mac/fast/repaint/shadow-multiple-horizontal-expected.png\n LayoutTests/platform/chromium-mac/fast/repaint/shadow-multiple-strict-horizontal-expected.png\n LayoutTests/platform/chromium-mac/fast/repaint/shadow-multiple-strict-vertical-expected.png\n LayoutTests/platform/chromium-mac/fast/repaint/shadow-multiple-vertical-expected.png\nAt: Thu 04 Aug 2011 00:50:38\nChanged By: [email protected]\nComments: Update baseline
s after <http://trac.webkit.org/changeset/92340>.\n\n* platform/chromium-mac/fast/box-shadow/inset-box-shadows-expected.png:\n* platform/chromium-mac/fast/repaint/shadow-multiple-horizontal-expected.png:\n* platform/chromium-mac/fast/repaint/shadow-multiple-strict-horizontal-expected.png:\n* platform/chromium-mac/fast/repaint/shadow-multiple-strict-vertical-expected.png:\n* platform/chromium-mac/fast/repaint/shadow-multiple-vertical-expected.png:Properties: \n\n\n"],
+ "changes": ["Files:\n Tools/CISupport/build-webkit-org/public_html/TestFailures/main.js\n Tools/ChangeLog\nAt: Thu 04 Aug 2011 00:50:38\nChanged By: [email protected]\nComments: Fix types. Sadly, main.js has no test coverage. (I need to think\nabout how to test this part of the code.)\n\n* CISupport/build-webkit-org/public_html/TestFailures/main.js:Properties: \n\n\n", "Files:\n LayoutTests/ChangeLog\n LayoutTests/platform/chromium-mac/fast/box-shadow/inset-box-shadows-expected.png\n LayoutTests/platform/chromium-mac/fast/repaint/shadow-multiple-horizontal-expected.png\n LayoutTests/platform/chromium-mac/fast/repaint/shadow-multiple-strict-horizontal-expected.png\n LayoutTests/platform/chromium-mac/fast/repaint/shadow-multiple-strict-vertical-expected.png\n LayoutTests/platform/chromium-mac/fast/repaint/shadow-multiple-vertical-expected.png\nAt: Thu 04 Aug 2011 00:50:38\nChanged By: [email protected]\nComments: Update baselines after <htt
p://trac.webkit.org/changeset/92340>.\n\n* platform/chromium-mac/fast/box-shadow/inset-box-shadows-expected.png:\n* platform/chromium-mac/fast/repaint/shadow-multiple-horizontal-expected.png:\n* platform/chromium-mac/fast/repaint/shadow-multiple-strict-horizontal-expected.png:\n* platform/chromium-mac/fast/repaint/shadow-multiple-strict-vertical-expected.png:\n* platform/chromium-mac/fast/repaint/shadow-multiple-vertical-expected.png:Properties: \n\n\n"],
"currentStep": null,
"eta": null,
"logs": [
@@ -127,8 +127,8 @@
"changes": [{
"branch": "trunk",
"category": null,
- "comments": "Fix types. Sadly, main.js has no test coverage. (I need to think\nabout how to test this part of the code.)\n\n* CISupport/build.webkit.org-config/public_html/TestFailures/main.js:",
- "files": ["Tools/CISupport/build.webkit.org-config/public_html/TestFailures/main.js", "Tools/ChangeLog"],
+ "comments": "Fix types. Sadly, main.js has no test coverage. (I need to think\nabout how to test this part of the code.)\n\n* CISupport/build-webkit-org/public_html/TestFailures/main.js:",
+ "files": ["Tools/CISupport/build-webkit-org/public_html/TestFailures/main.js", "Tools/ChangeLog"],
"number": 43707,
"properties": [],
"repository": "",
@@ -161,8 +161,8 @@
"changes": [{
"branch": "trunk",
"category": null,
- "comments": "Fix types. Sadly, main.js has no test coverage. (I need to think\nabout how to test this part of the code.)\n\n* CISupport/build.webkit.org-config/public_html/TestFailures/main.js:",
- "files": ["Tools/CISupport/build.webkit.org-config/public_html/TestFailures/main.js", "Tools/ChangeLog"],
+ "comments": "Fix types. Sadly, main.js has no test coverage. (I need to think\nabout how to test this part of the code.)\n\n* CISupport/build-webkit-org/public_html/TestFailures/main.js:",
+ "files": ["Tools/CISupport/build-webkit-org/public_html/TestFailures/main.js", "Tools/ChangeLog"],
"number": 43707,
"properties": [],
"repository": "",
@@ -715,7 +715,7 @@
var kExamplePerfBuildInfoJSON = {
"blame": ["[email protected]"],
"builderName": "Mac10.6 Perf",
- "changes": ["Files:\n Tools/CISupport/build.webkit.org-config/public_html/TestFailures/main.js\n Tools/ChangeLog\nAt: Thu 04 Aug 2011 00:50:38\nChanged By: [email protected]\nComments: Fix types. Sadly, main.js has no test coverage. (I need to think\nabout how to test this part of the code.)\n\n* CISupport/build.webkit.org-config/public_html/TestFailures/main.js:Properties: \n\n\n", "Files:\n LayoutTests/ChangeLog\n LayoutTests/platform/chromium-mac/fast/box-shadow/inset-box-shadows-expected.png\n LayoutTests/platform/chromium-mac/fast/repaint/shadow-multiple-horizontal-expected.png\n LayoutTests/platform/chromium-mac/fast/repaint/shadow-multiple-strict-horizontal-expected.png\n LayoutTests/platform/chromium-mac/fast/repaint/shadow-multiple-strict-vertical-expected.png\n LayoutTests/platform/chromium-mac/fast/repaint/shadow-multiple-vertical-expected.png\nAt: Thu 04 Aug 2011 00:50:38\nChanged By: [email protected]\nComments: Update baseline
s after <http://trac.webkit.org/changeset/92340>.\n\n* platform/chromium-mac/fast/box-shadow/inset-box-shadows-expected.png:\n* platform/chromium-mac/fast/repaint/shadow-multiple-horizontal-expected.png:\n* platform/chromium-mac/fast/repaint/shadow-multiple-strict-horizontal-expected.png:\n* platform/chromium-mac/fast/repaint/shadow-multiple-strict-vertical-expected.png:\n* platform/chromium-mac/fast/repaint/shadow-multiple-vertical-expected.png:Properties: \n\n\n"],
+ "changes": ["Files:\n Tools/CISupport/build-webkit-org/public_html/TestFailures/main.js\n Tools/ChangeLog\nAt: Thu 04 Aug 2011 00:50:38\nChanged By: [email protected]\nComments: Fix types. Sadly, main.js has no test coverage. (I need to think\nabout how to test this part of the code.)\n\n* CISupport/build-webkit-org/public_html/TestFailures/main.js:Properties: \n\n\n", "Files:\n LayoutTests/ChangeLog\n LayoutTests/platform/chromium-mac/fast/box-shadow/inset-box-shadows-expected.png\n LayoutTests/platform/chromium-mac/fast/repaint/shadow-multiple-horizontal-expected.png\n LayoutTests/platform/chromium-mac/fast/repaint/shadow-multiple-strict-horizontal-expected.png\n LayoutTests/platform/chromium-mac/fast/repaint/shadow-multiple-strict-vertical-expected.png\n LayoutTests/platform/chromium-mac/fast/repaint/shadow-multiple-vertical-expected.png\nAt: Thu 04 Aug 2011 00:50:38\nChanged By: [email protected]\nComments: Update baselines after <htt
p://trac.webkit.org/changeset/92340>.\n\n* platform/chromium-mac/fast/box-shadow/inset-box-shadows-expected.png:\n* platform/chromium-mac/fast/repaint/shadow-multiple-horizontal-expected.png:\n* platform/chromium-mac/fast/repaint/shadow-multiple-strict-horizontal-expected.png:\n* platform/chromium-mac/fast/repaint/shadow-multiple-strict-vertical-expected.png:\n* platform/chromium-mac/fast/repaint/shadow-multiple-vertical-expected.png:Properties: \n\n\n"],
"currentStep": null,
"eta": null,
"logs": [
@@ -752,8 +752,8 @@
"changes": [{
"branch": "trunk",
"category": null,
- "comments": "Fix types. Sadly, main.js has no test coverage. (I need to think\nabout how to test this part of the code.)\n\n* CISupport/build.webkit.org-config/public_html/TestFailures/main.js:",
- "files": ["Tools/CISupport/build.webkit.org-config/public_html/TestFailures/main.js", "Tools/ChangeLog"],
+ "comments": "Fix types. Sadly, main.js has no test coverage. (I need to think\nabout how to test this part of the code.)\n\n* CISupport/build-webkit-org/public_html/TestFailures/main.js:",
+ "files": ["Tools/CISupport/build-webkit-org/public_html/TestFailures/main.js", "Tools/ChangeLog"],
"number": 43707,
"properties": [],
"repository": "",
@@ -786,8 +786,8 @@
"changes": [{
"branch": "trunk",
"category": null,
- "comments": "Fix types. Sadly, main.js has no test coverage. (I need to think\nabout how to test this part of the code.)\n\n* CISupport/build.webkit.org-config/public_html/TestFailures/main.js:",
- "files": ["Tools/CISupport/build.webkit.org-config/public_html/TestFailures/main.js", "Tools/ChangeLog"],
+ "comments": "Fix types. Sadly, main.js has no test coverage. (I need to think\nabout how to test this part of the code.)\n\n* CISupport/build-webkit-org/public_html/TestFailures/main.js:",
+ "files": ["Tools/CISupport/build-webkit-org/public_html/TestFailures/main.js", "Tools/ChangeLog"],
"number": 43707,
"properties": [],
"repository": "",
Modified: trunk/Tools/CISupport/build-webkit-org/steps.py (269119 => 269120)
--- trunk/Tools/CISupport/build.webkit.org-config/steps.py 2020-10-28 20:28:00 UTC (rev 269119)
+++ trunk/Tools/CISupport/build-webkit-org/steps.py 2020-10-28 20:39:42 UTC (rev 269120)
@@ -563,7 +563,7 @@
resultDirectory = os.path.join(RunWebKitTests.resultDirectory, "dashboard-layout-test-results")
def start(self):
- self.setCommand(self.command + ["--layout-tests-directory", "./Tools/CISupport/build.webkit.org-config/public_html/dashboard/Scripts/tests"])
+ self.setCommand(self.command + ["--layout-tests-directory", "./Tools/CISupport/build-webkit-org/public_html/dashboard/Scripts/tests"])
return RunWebKitTests.start(self)
Modified: trunk/Tools/CISupport/build-webkit-org/steps_unittest.py (269119 => 269120)
--- trunk/Tools/CISupport/build.webkit.org-config/steps_unittest.py 2020-10-28 20:28:00 UTC (rev 269119)
+++ trunk/Tools/CISupport/build-webkit-org/steps_unittest.py 2020-10-28 20:39:42 UTC (rev 269120)
@@ -680,10 +680,6 @@
# FIXME: We should run this file as part of test-webkitpy.
-# Unfortunately test-webkitpy currently requires that unittests
-# be located in a directory with a valid module name.
-# 'build.webkit.org-config' is not a valid module name (due to '.' and '-')
-# so for now this is a stand-alone test harness.
if __name__ == '__main__':
BuildBotConfigLoader()._add_dependent_modules_to_sys_modules()
from loadConfig import *
Modified: trunk/Tools/CISupport/build-webkit-org/wkbuild.py (269119 => 269120)
--- trunk/Tools/CISupport/build.webkit.org-config/wkbuild.py 2020-10-28 20:28:00 UTC (rev 269119)
+++ trunk/Tools/CISupport/build-webkit-org/wkbuild.py 2020-10-28 20:39:42 UTC (rev 269120)
@@ -59,7 +59,7 @@
("Examples", []),
("PerformanceTests", []),
("ManualTests", []),
- ("Tools/CISupport/build.webkit.org-config/public_html", []),
+ ("Tools/CISupport/build-webkit-org/public_html", []),
("Websites", []),
("opengl", []),
("opentype", []),
Modified: trunk/Tools/CISupport/build-webkit-org/wkbuild_unittest.py (269119 => 269120)
--- trunk/Tools/CISupport/build.webkit.org-config/wkbuild_unittest.py 2020-10-28 20:28:00 UTC (rev 269119)
+++ trunk/Tools/CISupport/build-webkit-org/wkbuild_unittest.py 2020-10-28 20:39:42 UTC (rev 269120)
@@ -65,7 +65,7 @@
(["Source/WebCore/accessibility/ios/AXObjectCacheIOS.mm"], ["ios-14", "ios-simulator-14", "tvos-14", "tvos-simulator-14", "watchos-7", "watchos-simulator-7"]),
(["Source/WebCore/rendering/RenderThemeMac.mm", "Source/WebCore/rendering/RenderThemeMac.h"], ["mac-yosemite", "mac-elcapitan", "mac-sierra", "mac-highsierra", "mac-mojave"]),
(["Source/WebCore/rendering/RenderThemeIOS.mm", "Source/WebCore/rendering/RenderThemeIOS.h"], ["ios-14", "ios-simulator-14", "tvos-14", "tvos-simulator-14", "watchos-7", "watchos-simulator-7"]),
- (["Tools/CISupport/build.webkit.org-config/public_html/LeaksViewer/LeaksViewer.js"], []),
+ (["Tools/CISupport/build-webkit-org/public_html/LeaksViewer/LeaksViewer.js"], []),
]
def test_should_build(self):
@@ -76,10 +76,6 @@
should_build = platform in platforms or "*" in platforms
self.assertEqual(wkbuild.should_build(platform, files), should_build, "%s should%s have built but did%s (files: %s)" % (platform, "" if should_build else "n't", "n't" if should_build else "", str(files)))
-# FIXME: We should run this file as part of test-rm .
-# Unfortunately test-rm currently requires that unittests
-# be located in a directory with a valid module name.
-# 'build.webkit.org-config' is not a valid module name (due to '.' and '-')
-# so for now this is a stand-alone test harness.
+# FIXME: We should run this file as part of test-webkitpy.
if __name__ == '__main__':
unittest.main()
Modified: trunk/Tools/CISupport/ews-build/steps.py (269119 => 269120)
--- trunk/Tools/CISupport/ews-build/steps.py 2020-10-28 20:28:00 UTC (rev 269119)
+++ trunk/Tools/CISupport/ews-build/steps.py 2020-10-28 20:39:42 UTC (rev 269120)
@@ -255,7 +255,7 @@
]
services_paths = [
- 'Tools/CISupport/build.webkit.org-config',
+ 'Tools/CISupport/build-webkit-org',
'Tools/CISupport/ews-build',
'Tools/CISupport/Shared',
'Tools/Scripts/libraries/resultsdbpy',
@@ -1125,7 +1125,7 @@
command = ['python', 'steps_unittest.py']
def __init__(self, **kwargs):
- shell.ShellCommand.__init__(self, workdir='build/Tools/CISupport/build.webkit.org-config', timeout=2 * 60, logEnviron=False, **kwargs)
+ shell.ShellCommand.__init__(self, workdir='build/Tools/CISupport/build-webkit-org', timeout=2 * 60, logEnviron=False, **kwargs)
def getResultSummary(self):
if self.results == SUCCESS:
Modified: trunk/Tools/CISupport/ews-build/steps_unittest.py (269119 => 269120)
--- trunk/Tools/CISupport/ews-build/steps_unittest.py 2020-10-28 20:28:00 UTC (rev 269119)
+++ trunk/Tools/CISupport/ews-build/steps_unittest.py 2020-10-28 20:39:42 UTC (rev 269120)
@@ -734,7 +734,7 @@
def test_success(self):
self.setupStep(RunBuildWebKitOrgUnitTests())
self.expectRemoteCommands(
- ExpectShell(workdir='build/Tools/CISupport/build.webkit.org-config',
+ ExpectShell(workdir='build/Tools/CISupport/build-webkit-org',
timeout=120,
logEnviron=False,
command=['python', 'steps_unittest.py'],
@@ -747,7 +747,7 @@
def test_failure(self):
self.setupStep(RunBuildWebKitOrgUnitTests())
self.expectRemoteCommands(
- ExpectShell(workdir='build/Tools/CISupport/build.webkit.org-config',
+ ExpectShell(workdir='build/Tools/CISupport/build-webkit-org',
timeout=120,
logEnviron=False,
command=['python', 'steps_unittest.py'],
Modified: trunk/Tools/ChangeLog (269119 => 269120)
--- trunk/Tools/ChangeLog 2020-10-28 20:28:00 UTC (rev 269119)
+++ trunk/Tools/ChangeLog 2020-10-28 20:39:42 UTC (rev 269120)
@@ -1,3 +1,25 @@
+2020-10-28 Aakash Jain <[email protected]>
+
+ Rename build.webkit.org-config directory to build-webkit-org
+ https://bugs.webkit.org/show_bug.cgi?id=218302
+
+ Reviewed by Jonathan Bedard.
+
+ * CISupport/build-webkit-org: Copied from Tools/CISupport/build.webkit.org-config.
+ * CISupport/build-webkit-org/htdigestparser_unittest.py:
+ * CISupport/build-webkit-org/public_html/TestFailures/scripts/builders_unittests.js:
+ * CISupport/build-webkit-org/steps.py:
+ * CISupport/build-webkit-org/steps_unittest.py:
+ * CISupport/build-webkit-org/wkbuild.py:
+ * CISupport/build-webkit-org/wkbuild_unittest.py:
+ * CISupport/build.webkit.org-config: Removed.
+ * CISupport/ews-build/steps.py:
+ * CISupport/ews-build/steps_unittest.py:
+ * Scripts/run-dashboard-tests:
+ * Scripts/webkitpy/layout_tests/views/buildbot_results.py:
+ * Scripts/webkitpy/style/checker_unittest.py:
+ * Scripts/webkitpy/tool/servers/gardeningserver.py:
+
2020-10-28 Jonathan Bedard <[email protected]>
[webkitscmpy] Support finding commit by tag
Modified: trunk/Tools/Scripts/run-dashboard-tests (269119 => 269120)
--- trunk/Tools/Scripts/run-dashboard-tests 2020-10-28 20:28:00 UTC (rev 269119)
+++ trunk/Tools/Scripts/run-dashboard-tests 2020-10-28 20:39:42 UTC (rev 269120)
@@ -25,6 +25,6 @@
TOOLS_DIRECTORY="$(dirname $0)"
RUN_WEBKIT_TESTS="$TOOLS_DIRECTORY/run-webkit-tests"
-TEST_DIRECTORY="$TOOLS_DIRECTORY/../CISupport/build.webkit.org-config/public_html/dashboard/Scripts/tests"
+TEST_DIRECTORY="$TOOLS_DIRECTORY/../CISupport/build-webkit-org/public_html/dashboard/Scripts/tests"
$RUN_WEBKIT_TESTS --layout-tests-directory=$TEST_DIRECTORY "$@"
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/views/buildbot_results.py (269119 => 269120)
--- trunk/Tools/Scripts/webkitpy/layout_tests/views/buildbot_results.py 2020-10-28 20:28:00 UTC (rev 269119)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/views/buildbot_results.py 2020-10-28 20:39:42 UTC (rev 269120)
@@ -39,7 +39,7 @@
class BuildBotPrinter(object):
# This output is parsed by buildbots and must only be changed in coordination with buildbot scripts (see webkit.org's
- # Tools/CISupport/build.webkit.org-config/master.cfg: RunWebKitTests._parseNewRunWebKitTestsOutput
+ # Tools/CISupport/build-webkit-org/master.cfg: RunWebKitTests._parseNewRunWebKitTestsOutput
# and chromium.org's buildbot/master.chromium/scripts/master/log_parser/webkit_test_command.py).
def __init__(self, stream, debug_logging):
Modified: trunk/Tools/Scripts/webkitpy/style/checker_unittest.py (269119 => 269120)
--- trunk/Tools/Scripts/webkitpy/style/checker_unittest.py 2020-10-28 20:28:00 UTC (rev 269119)
+++ trunk/Tools/Scripts/webkitpy/style/checker_unittest.py 2020-10-28 20:39:42 UTC (rev 269120)
@@ -501,7 +501,7 @@
"""Test paths that should be checked as JSON."""
paths = [
os.path.join('Source', 'WebCore', 'inspector', 'Inspector.json'),
- os.path.join('Tools', 'CISupport', 'build.webkit.org-config', 'config.json'),
+ os.path.join('Tools', 'CISupport', 'build-webkit-org', 'config.json'),
]
for path in paths:
Modified: trunk/Tools/Scripts/webkitpy/tool/servers/gardeningserver.py (269119 => 269120)
--- trunk/Tools/Scripts/webkitpy/tool/servers/gardeningserver.py 2020-10-28 20:28:00 UTC (rev 269119)
+++ trunk/Tools/Scripts/webkitpy/tool/servers/gardeningserver.py 2020-10-28 20:39:42 UTC (rev 269120)
@@ -70,7 +70,7 @@
'..',
'..',
'CISupport',
- 'build.webkit.org-config',
+ 'build-webkit-org',
'public_html',
'TestFailures')
