Skip to content

GitLab

T
tangled
Commit 3718a812 authored by abarth@webkit.org's avatar abarth@webkit.org
Browse files
Options

Update Tools to account for (CG) being added to Chromium builder names 

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

Reviewed by Adam Barth.

Some of these names will change back once we turn on Skia bots.

* BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/builders_unittests.js:
* BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/config.js:
* BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/ui_unittests.js:
* Scripts/webkitpy/layout_tests/port/builders.py:
* Scripts/webkitpy/tool/commands/rebaseline_unittest.py:
* TestResultServer/static-dashboards/builders.js:
* TestResultServer/static-dashboards/flakiness_dashboard_tests.js:


git-svn-id: svn://svn.chromium.org/blink/trunk@93242 bbb929c8-8fbe-4397-9dbb-9b2b20218538
parent eeb15f2e
Hide whitespace changes
Inline Side-by-side
Showing with 59 additions and 42 deletions
third_party/WebKit/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/builders_unittests.js
View file @ 3718a812
......@@ -37,7 +37,7 @@ var kExampleBuilderStatusJSON = {
"slaves": ["vm124-m1"],
"state": "building"
},
"Webkit Mac10.6": {
"Webkit Mac10.6 (CG)": {
"basedir": "Webkit_Linux",
"cachedBuilds": [11459, 11460, 11461, 11462],
"category": "6webkit linux latest",
......@@ -325,7 +325,7 @@ test("buildersFailingStepRequredForTestCoverage", 3, function() {
callback(kExampleBuilderStatusJSON);
else if (/Webkit%20Linux/.exec(url))
callback(kExampleBuildInfoJSON);
else if (/Webkit%20Mac10\.6/.exec(url))
else if (/Webkit%20Mac10\.6%20(CG)/.exec(url))
callback(failingBuildInfoJSON);
else {
ok(false, "Unexpected URL: " + url);
......@@ -336,14 +336,14 @@ test("buildersFailingStepRequredForTestCoverage", 3, function() {
simulator.runTest(function() {
builders.buildersFailingStepRequredForTestCoverage(function(builderNameList) {
deepEqual(builderNameList, ["Webkit Mac10.6"]);
deepEqual(builderNameList, ["Webkit Mac10.6 CG"]);
});
});
deepEqual(requestedURLs, [
"http://build.chromium.org/p/chromium.webkit/json/builders",
"http://build.chromium.org/p/chromium.webkit/json/builders/Webkit%20Linux/builds/11461",
"http://build.chromium.org/p/chromium.webkit/json/builders/Webkit%20Mac10.6/builds/11460",
"http://build.chromium.org/p/chromium.webkit/json/builders/Webkit%20Mac10.6%20(CG)/builds/11460",
]);
});
......
third_party/WebKit/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/config.js
View file @ 3718a812
......@@ -37,11 +37,11 @@ config.kBuilders = [
'Webkit Linux 32',
'Webkit Linux (dbg)(1)',
'Webkit Linux (dbg)(2)',
'Webkit Mac10.5',
'Webkit Mac10.5 (dbg)(1)',
'Webkit Mac10.5 (dbg)(2)',
'Webkit Mac10.6',
'Webkit Mac10.6 (dbg)',
'Webkit Mac10.5 (CG)',
'Webkit Mac10.5 (CG)(dbg)(1)',
'Webkit Mac10.5 (CG)(dbg)(2)',
'Webkit Mac10.6 (CG)',
'Webkit Mac10.6 (CG)(dbg)',
];
config.kBuildersThatOnlyCompile = [
......
third_party/WebKit/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/ui_unittests.js
View file @ 3718a812
......@@ -132,11 +132,11 @@ test("summarizeFailure", 1, function() {
var failureAnalysis = {
"testName": "svg/dynamic-updates/SVGFETurbulenceElement-svgdom-baseFrequency-prop.html",
"resultNodesByBuilder": {
"Webkit Mac10.5": {
"Webkit Mac10.5 (CG)": {
"expected": "IMAGE",
"actual": "PASS"
},
"Webkit Mac10.5 (dbg)(2)": {
"Webkit Mac10.5 (CG)(dbg)(2)": {
"expected": "IMAGE",
"actual":"PASS"
}
......@@ -148,13 +148,13 @@ test("summarizeFailure", 1, function() {
deepEqual(failureInfoList, [{
"testName": "svg/dynamic-updates/SVGFETurbulenceElement-svgdom-baseFrequency-prop.html",
"builderName": "Webkit Mac10.5",
"builderName": "Webkit Mac10.5 (CG)",
"failureTypeList": [
"PASS"
]
}, {
"testName": "svg/dynamic-updates/SVGFETurbulenceElement-svgdom-baseFrequency-prop.html",
"builderName": "Webkit Mac10.5 (dbg)(2)",
"builderName": "Webkit Mac10.5 (CG)(dbg)(2)",
"failureTypeList": [
"PASS"
]
......
third_party/WebKit/Tools/ChangeLog
View file @ 3718a812
2011-08-17 Adam Barth <abarth@webkit.org>
Update Tools to account for (CG) being added to Chromium builder names
https://bugs.webkit.org/show_bug.cgi?id=66410
Reviewed by Adam Barth.
Some of these names will change back once we turn on Skia bots.
* BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/builders_unittests.js:
* BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/config.js:
* BuildSlaveSupport/build.webkit.org-config/public_html/TestFailures/ui_unittests.js:
* Scripts/webkitpy/layout_tests/port/builders.py:
* Scripts/webkitpy/tool/commands/rebaseline_unittest.py:
* TestResultServer/static-dashboards/builders.js:
* TestResultServer/static-dashboards/flakiness_dashboard_tests.js:
2011-08-16 Dimitri Glazkov <dglazkov@chromium.org>
Wire up relative time to garden-o-matic summary view.
third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/builders.py
View file @ 3718a812
......@@ -46,11 +46,11 @@ _exact_matches = {
"Webkit Linux 32": {"port_name": "chromium-linux-x86", "specifiers": set(["linux", "x86"])},
"Webkit Linux (dbg)(1)": {"port_name": "chromium-linux-x86_64", "specifiers": set(["linux", "debug"])},
"Webkit Linux (dbg)(2)": {"port_name": "chromium-linux-x86_64", "specifiers": set(["linux", "debug"])},
"Webkit Mac10.5": {"port_name": "chromium-cg-mac-leopard", "specifiers": set(["leopard"])},
"Webkit Mac10.5 (dbg)(1)": {"port_name": "chromium-cg-mac-leopard", "specifiers": set(["leopard", "debug"])},
"Webkit Mac10.5 (dbg)(2)": {"port_name": "chromium-cg-mac-leopard", "specifiers": set(["leopard", "debug"])},
"Webkit Mac10.6": {"port_name": "chromium-cg-mac-snowleopard", "specifiers": set(["snowleopard"])},
"Webkit Mac10.6 (dbg)": {"port_name": "chromium-cg-mac-snowleopard", "specifiers": set(["snowleopard", "debug"])},
"Webkit Mac10.5 (CG)": {"port_name": "chromium-cg-mac-leopard", "specifiers": set(["leopard"])},
"Webkit Mac10.5 (CG)(dbg)(1)": {"port_name": "chromium-cg-mac-leopard", "specifiers": set(["leopard", "debug"])},
"Webkit Mac10.5 (CG)(dbg)(2)": {"port_name": "chromium-cg-mac-leopard", "specifiers": set(["leopard", "debug"])},
"Webkit Mac10.6 (CG)": {"port_name": "chromium-cg-mac-snowleopard", "specifiers": set(["snowleopard"])},
"Webkit Mac10.6 (CG)(dbg)": {"port_name": "chromium-cg-mac-snowleopard", "specifiers": set(["snowleopard", "debug"])},
"Webkit Mac10.6 - GPU": {"port_name": "chromium-gpu-mac-snowleopard", "specifiers": set(["snowleopard", "gpu"])},
"Webkit Win - GPU": {"port_name": "chromium-gpu-win-xp", "specifiers": set(["xp", "release", "gpu"])},
"Webkit Win7 - GPU": {"port_name": "chromium-gpu-win-win7", "specifiers": set(["win7", "vista", "release", "gpu"])},
......
third_party/WebKit/Tools/Scripts/webkitpy/tool/commands/rebaseline_unittest.py
View file @ 3718a812
......@@ -52,10 +52,10 @@ class TestRebaseline(unittest.TestCase):
tool = MockTool()
tool.executive = MockExecutive(should_log=True)
command.bind_to_tool(tool)
expected_stdout = """Retrieving results for chromium-cg-mac-leopard from Webkit Mac10.5.
expected_stdout = """Retrieving results for chromium-cg-mac-leopard from Webkit Mac10.5 (CG).
userscripts/another-test.html
userscripts/images.svg
Retrieving results for chromium-cg-mac-snowleopard from Webkit Mac10.6.
Retrieving results for chromium-cg-mac-snowleopard from Webkit Mac10.6 (CG).
userscripts/another-test.html
userscripts/images.svg
Retrieving results for chromium-gpu-mac-leopard from Webkit Mac10.5 - GPU.
......@@ -80,10 +80,10 @@ Retrieving results for chromium-win-xp from Webkit Win.
Optimizing baselines for userscripts/another-test.html.
Optimizing baselines for userscripts/images.svg.
"""
expected_stderr = """MOCK run_command: ['echo', 'rebaseline-test', 'Webkit Mac10.5', 'userscripts/another-test.html'], cwd=/mock-checkout
MOCK run_command: ['echo', 'rebaseline-test', 'Webkit Mac10.5', 'userscripts/images.svg'], cwd=/mock-checkout
MOCK run_command: ['echo', 'rebaseline-test', 'Webkit Mac10.6', 'userscripts/another-test.html'], cwd=/mock-checkout
MOCK run_command: ['echo', 'rebaseline-test', 'Webkit Mac10.6', 'userscripts/images.svg'], cwd=/mock-checkout
expected_stderr = """MOCK run_command: ['echo', 'rebaseline-test', 'Webkit Mac10.5 (CG)', 'userscripts/another-test.html'], cwd=/mock-checkout
MOCK run_command: ['echo', 'rebaseline-test', 'Webkit Mac10.5 (CG)', 'userscripts/images.svg'], cwd=/mock-checkout
MOCK run_command: ['echo', 'rebaseline-test', 'Webkit Mac10.6 (CG)', 'userscripts/another-test.html'], cwd=/mock-checkout
MOCK run_command: ['echo', 'rebaseline-test', 'Webkit Mac10.6 (CG)', 'userscripts/images.svg'], cwd=/mock-checkout
MOCK run_command: ['echo', 'rebaseline-test', 'Webkit Linux 32', 'userscripts/another-test.html'], cwd=/mock-checkout
MOCK run_command: ['echo', 'rebaseline-test', 'Webkit Linux 32', 'userscripts/images.svg'], cwd=/mock-checkout
MOCK run_command: ['echo', 'rebaseline-test', 'Webkit Linux', 'userscripts/another-test.html'], cwd=/mock-checkout
......
third_party/WebKit/Tools/TestResultServer/static-dashboards/builders.js
View file @ 3718a812
......@@ -96,9 +96,9 @@ var CHROMIUM_DEPS_BUILDERS = [
['Webkit Linux (deps)', BuilderGroup.EXPECTATIONS_BUILDER],
['Webkit Linux (deps)(dbg)(1)'],
['Webkit Linux (deps)(dbg)(2)'],
['Webkit Mac10.6 (deps)'],
['Webkit Mac10.6 (deps)(dbg)(1)'],
['Webkit Mac10.6 (deps)(dbg)(2)']
['Webkit Mac10.6 (CG)(deps)'],
['Webkit Mac10.6 (CG)(deps)(dbg)(1)'],
['Webkit Mac10.6 (CG)(deps)(dbg)(2)']
];
associateBuildersWithMaster(CHROMIUM_DEPS_BUILDERS, CHROMIUM_WEBKIT_BUILDER_MASTER);
......@@ -112,11 +112,11 @@ var CHROMIUM_TOT_BUILDERS = [
['Webkit Linux 32'],
['Webkit Linux (dbg)(1)'],
['Webkit Linux (dbg)(2)'],
['Webkit Mac10.5'],
['Webkit Mac10.5 (dbg)(1)'],
['Webkit Mac10.5 (dbg)(2)'],
['Webkit Mac10.6'],
['Webkit Mac10.6 (dbg)']
['Webkit Mac10.5 (CG)'],
['Webkit Mac10.5 (CG)(dbg)(1)'],
['Webkit Mac10.5 (CG)(dbg)(2)'],
['Webkit Mac10.6 (CG)'],
['Webkit Mac10.6 (CG)(dbg)']
];
associateBuildersWithMaster(CHROMIUM_TOT_BUILDERS, CHROMIUM_WEBKIT_BUILDER_MASTER);
......
third_party/WebKit/Tools/TestResultServer/static-dashboards/flakiness_dashboard_tests.js
View file @ 3718a812
......@@ -139,8 +139,8 @@ function testOverrideJustBuildType()
runExpectationsTest('Webkit Win (dbg)(3)', test, 'FAIL PASS TIMEOUT', 'WONTFIX');
runExpectationsTest('Webkit Linux', test, 'FAIL PASS TIMEOUT', 'WONTFIX');
runExpectationsTest('Webkit Linux (dbg)(3)', test, 'CRASH', 'LINUX DEBUG');
runExpectationsTest('Webkit Mac10.5', test, 'FAIL', 'WONTFIX MAC');
runExpectationsTest('Webkit Mac10.5 (dbg)(3)', test, 'FAIL', 'WONTFIX MAC');
runExpectationsTest('Webkit Mac10.5 (CG)', test, 'FAIL', 'WONTFIX MAC');
runExpectationsTest('Webkit Mac10.5 (CG)(dbg)(3)', test, 'FAIL', 'WONTFIX MAC');
}
function testPlatformAndBuildType()
......@@ -158,9 +158,9 @@ function testPlatformAndBuildType()
runPlatformAndBuildTypeTest('Webkit Linux (deps)', 'LUCID', 'RELEASE');
runPlatformAndBuildTypeTest('Webkit Linux (deps)(dbg)(1)', 'LUCID', 'DEBUG');
runPlatformAndBuildTypeTest('Webkit Linux (deps)(dbg)(2)', 'LUCID', 'DEBUG');
runPlatformAndBuildTypeTest('Webkit Mac10.6 (deps)', 'SNOWLEOPARD', 'RELEASE');
runPlatformAndBuildTypeTest('Webkit Mac10.6 (deps)(dbg)(1)', 'SNOWLEOPARD', 'DEBUG');
runPlatformAndBuildTypeTest('Webkit Mac10.6 (deps)(dbg)(2)', 'SNOWLEOPARD', 'DEBUG');
runPlatformAndBuildTypeTest('Webkit Mac10.6 (CG)(deps)', 'SNOWLEOPARD', 'RELEASE');
runPlatformAndBuildTypeTest('Webkit Mac10.6 (CG)(deps)(dbg)(1)', 'SNOWLEOPARD', 'DEBUG');
runPlatformAndBuildTypeTest('Webkit Mac10.6 (CG)(deps)(dbg)(2)', 'SNOWLEOPARD', 'DEBUG');
runPlatformAndBuildTypeTest('Webkit Win', 'XP', 'RELEASE');
runPlatformAndBuildTypeTest('Webkit Vista', 'VISTA', 'RELEASE');
runPlatformAndBuildTypeTest('Webkit Win7', 'WIN7', 'RELEASE');
......@@ -170,11 +170,11 @@ function testPlatformAndBuildType()
runPlatformAndBuildTypeTest('Webkit Linux 32', 'LUCID', 'RELEASE');
runPlatformAndBuildTypeTest('Webkit Linux (dbg)(1)', 'LUCID', 'DEBUG');
runPlatformAndBuildTypeTest('Webkit Linux (dbg)(2)', 'LUCID', 'DEBUG');
runPlatformAndBuildTypeTest('Webkit Mac10.5', 'LEOPARD', 'RELEASE');
runPlatformAndBuildTypeTest('Webkit Mac10.5 (dbg)(1)', 'LEOPARD', 'DEBUG');
runPlatformAndBuildTypeTest('Webkit Mac10.5 (dbg)(2)', 'LEOPARD', 'DEBUG');
runPlatformAndBuildTypeTest('Webkit Mac10.6', 'SNOWLEOPARD', 'RELEASE');
runPlatformAndBuildTypeTest('Webkit Mac10.6 (dbg)', 'SNOWLEOPARD', 'DEBUG');
runPlatformAndBuildTypeTest('Webkit Mac10.5 (CG)', 'LEOPARD', 'RELEASE');
runPlatformAndBuildTypeTest('Webkit Mac10.5 (CG)(dbg)(1)', 'LEOPARD', 'DEBUG');
runPlatformAndBuildTypeTest('Webkit Mac10.5 (CG)(dbg)(2)', 'LEOPARD', 'DEBUG');
runPlatformAndBuildTypeTest('Webkit Mac10.6 (CG)', 'SNOWLEOPARD', 'RELEASE');
runPlatformAndBuildTypeTest('Webkit Mac10.6 (CG)(dbg)', 'SNOWLEOPARD', 'DEBUG');
runPlatformAndBuildTypeTest('Webkit Win - GPU', 'XP', 'RELEASE');
runPlatformAndBuildTypeTest('Webkit Vista - GPU', 'VISTA', 'RELEASE');
runPlatformAndBuildTypeTest('Webkit Win7 - GPU', 'WIN7', 'RELEASE');
......
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