<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[281322] trunk/Tools</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/281322">281322</a></dd>
<dt>Author</dt> <dd>clopez@igalia.com</dd>
<dt>Date</dt> <dd>2021-08-20 10:12:40 -0700 (Fri, 20 Aug 2021)</dd>
</dl>

<h3>Log Message</h3>
<pre>[ews-build.webkit.org] Add unit test with the expected build steps for each queue
https://bugs.webkit.org/show_bug.cgi?id=229319

Reviewed by Aakash Jain.

Add a unit test listing all the expected build steps for each queue
like the one added in <a href="http://trac.webkit.org/projects/webkit/changeset/281286">r281286</a> for build.webkit.org
Also remove the previous unit tests to not duplicate test functionality.
And replace doble-quotes with single-ones on the test for build.webkit.org

* CISupport/build-webkit-org/factories_unittest.py:
(TestExpectedBuildSteps):
(TestExpectedBuildSteps.test_all_expected_steps):
(TestExpectedBuildSteps.test_unnecessary_expected_steps):
* CISupport/ews-build/factories_unittest.py:
(TestExpectedBuildSteps):
(TestExpectedBuildSteps.setUp):
(TestExpectedBuildSteps.test_all_expected_steps):
(TestExpectedBuildSteps.test_unnecessary_expected_steps):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsCISupportbuildwebkitorgfactories_unittestpy">trunk/Tools/CISupport/build-webkit-org/factories_unittest.py</a></li>
<li><a href="#trunkToolsCISupportewsbuildfactories_unittestpy">trunk/Tools/CISupport/ews-build/factories_unittest.py</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsCISupportbuildwebkitorgfactories_unittestpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/CISupport/build-webkit-org/factories_unittest.py (281321 => 281322)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/CISupport/build-webkit-org/factories_unittest.py     2021-08-20 17:01:00 UTC (rev 281321)
+++ trunk/Tools/CISupport/build-webkit-org/factories_unittest.py        2021-08-20 17:12:40 UTC (rev 281322)
</span><span class="lines">@@ -23,1351 +23,1349 @@
</span><span class="cx"> 
</span><span class="cx"> import loadConfig
</span><span class="cx"> import os
</span><ins>+import unittest
</ins><span class="cx"> 
</span><del>-from twisted.trial import unittest
-
-
</del><span class="cx"> class TestExpectedBuildSteps(unittest.TestCase):
</span><span class="cx"> 
</span><span class="cx">     expected_steps = {
</span><del>-        "Apple-BigSur-Release-Build": [
-            "configure-build",
-            "configuration",
-            "clean-and-update-working-directory",
-            "show-identifier",
-            "kill-old-processes",
-            "delete-WebKitBuild-directory",
-            "delete-stale-build-files",
-            "compile-webkit",
-            "archive-built-product",
-            "upload",
-            "archive-built-product",
-            "upload",
-            "transfer-to-s3",
-            "trigger"
</del><ins>+        'Apple-BigSur-Release-Build': [
+            'configure-build',
+            'configuration',
+            'clean-and-update-working-directory',
+            'show-identifier',
+            'kill-old-processes',
+            'delete-WebKitBuild-directory',
+            'delete-stale-build-files',
+            'compile-webkit',
+            'archive-built-product',
+            'upload',
+            'archive-built-product',
+            'upload',
+            'transfer-to-s3',
+            'trigger'
</ins><span class="cx">         ],
</span><del>-        "Apple-BigSur-AppleSilicon-Release-Test262-Tests": [
-            "configure-build",
-            "configuration",
-            "clean-and-update-working-directory",
-            "show-identifier",
-            "kill-old-processes",
-            "delete-WebKitBuild-directory",
-            "delete-stale-build-files",
-            "download-built-product",
-            "extract-built-product",
-            "test262-test"
</del><ins>+        'Apple-BigSur-AppleSilicon-Release-Test262-Tests': [
+            'configure-build',
+            'configuration',
+            'clean-and-update-working-directory',
+            'show-identifier',
+            'kill-old-processes',
+            'delete-WebKitBuild-directory',
+            'delete-stale-build-files',
+            'download-built-product',
+            'extract-built-product',
+            'test262-test'
</ins><span class="cx">         ],
</span><del>-        "Apple-BigSur-Release-Test262-Tests": [
-            "configure-build",
-            "configuration",
-            "clean-and-update-working-directory",
-            "show-identifier",
-            "kill-old-processes",
-            "delete-WebKitBuild-directory",
-            "delete-stale-build-files",
-            "download-built-product",
-            "extract-built-product",
-            "test262-test"
</del><ins>+        'Apple-BigSur-Release-Test262-Tests': [
+            'configure-build',
+            'configuration',
+            'clean-and-update-working-directory',
+            'show-identifier',
+            'kill-old-processes',
+            'delete-WebKitBuild-directory',
+            'delete-stale-build-files',
+            'download-built-product',
+            'extract-built-product',
+            'test262-test'
</ins><span class="cx">         ],
</span><del>-        "Apple-BigSur-Release-WK1-Tests": [
-            "configure-build",
-            "configuration",
-            "clean-and-update-working-directory",
-            "show-identifier",
-            "kill-old-processes",
-            "delete-WebKitBuild-directory",
-            "delete-stale-build-files",
-            "download-built-product",
-            "extract-built-product",
-            "wait-for-crash-collection",
-            "layout-test",
-            "dashboard-tests",
-            "archive-test-results",
-            "upload",
-            "extract-test-results",
-            "set-permissions",
-            "run-api-tests",
-            "lldb-webkit-test",
-            "webkitpy-test",
-            "webkitperl-test",
-            "bindings-generation-tests",
-            "builtins-generator-tests",
-            "trigger-crash-log-submission"
</del><ins>+        'Apple-BigSur-Release-WK1-Tests': [
+            'configure-build',
+            'configuration',
+            'clean-and-update-working-directory',
+            'show-identifier',
+            'kill-old-processes',
+            'delete-WebKitBuild-directory',
+            'delete-stale-build-files',
+            'download-built-product',
+            'extract-built-product',
+            'wait-for-crash-collection',
+            'layout-test',
+            'dashboard-tests',
+            'archive-test-results',
+            'upload',
+            'extract-test-results',
+            'set-permissions',
+            'run-api-tests',
+            'lldb-webkit-test',
+            'webkitpy-test',
+            'webkitperl-test',
+            'bindings-generation-tests',
+            'builtins-generator-tests',
+            'trigger-crash-log-submission'
</ins><span class="cx">         ],
</span><del>-        "Apple-BigSur-Release-AppleSilicon-WK2-Tests": [
-            "configure-build",
-            "configuration",
-            "clean-and-update-working-directory",
-            "show-identifier",
-            "kill-old-processes",
-            "delete-WebKitBuild-directory",
-            "delete-stale-build-files",
-            "download-built-product",
-            "extract-built-product",
-            "wait-for-crash-collection",
-            "layout-test",
-            "dashboard-tests",
-            "archive-test-results",
-            "upload",
-            "extract-test-results",
-            "set-permissions",
-            "run-api-tests",
-            "lldb-webkit-test",
-            "webkitpy-test",
-            "webkitperl-test",
-            "bindings-generation-tests",
-            "builtins-generator-tests",
-            "trigger-crash-log-submission"
</del><ins>+        'Apple-BigSur-Release-AppleSilicon-WK2-Tests': [
+            'configure-build',
+            'configuration',
+            'clean-and-update-working-directory',
+            'show-identifier',
+            'kill-old-processes',
+            'delete-WebKitBuild-directory',
+            'delete-stale-build-files',
+            'download-built-product',
+            'extract-built-product',
+            'wait-for-crash-collection',
+            'layout-test',
+            'dashboard-tests',
+            'archive-test-results',
+            'upload',
+            'extract-test-results',
+            'set-permissions',
+            'run-api-tests',
+            'lldb-webkit-test',
+            'webkitpy-test',
+            'webkitperl-test',
+            'bindings-generation-tests',
+            'builtins-generator-tests',
+            'trigger-crash-log-submission'
</ins><span class="cx">         ],
</span><del>-        "Apple-BigSur-Release-AppleSilicon-WK1-Tests": [
-            "configure-build",
-            "configuration",
-            "clean-and-update-working-directory",
-            "show-identifier",
-            "kill-old-processes",
-            "delete-WebKitBuild-directory",
-            "delete-stale-build-files",
-            "download-built-product",
-            "extract-built-product",
-            "wait-for-crash-collection",
-            "layout-test",
-            "dashboard-tests",
-            "archive-test-results",
-            "upload",
-            "extract-test-results",
-            "set-permissions",
-            "run-api-tests",
-            "lldb-webkit-test",
-            "webkitpy-test",
-            "webkitperl-test",
-            "bindings-generation-tests",
-            "builtins-generator-tests",
-            "trigger-crash-log-submission"
</del><ins>+        'Apple-BigSur-Release-AppleSilicon-WK1-Tests': [
+            'configure-build',
+            'configuration',
+            'clean-and-update-working-directory',
+            'show-identifier',
+            'kill-old-processes',
+            'delete-WebKitBuild-directory',
+            'delete-stale-build-files',
+            'download-built-product',
+            'extract-built-product',
+            'wait-for-crash-collection',
+            'layout-test',
+            'dashboard-tests',
+            'archive-test-results',
+            'upload',
+            'extract-test-results',
+            'set-permissions',
+            'run-api-tests',
+            'lldb-webkit-test',
+            'webkitpy-test',
+            'webkitperl-test',
+            'bindings-generation-tests',
+            'builtins-generator-tests',
+            'trigger-crash-log-submission'
</ins><span class="cx">         ],
</span><del>-        "Apple-BigSur-Release-WK2-Tests": [
-            "configure-build",
-            "configuration",
-            "clean-and-update-working-directory",
-            "show-identifier",
-            "kill-old-processes",
-            "delete-WebKitBuild-directory",
-            "delete-stale-build-files",
-            "download-built-product",
-            "extract-built-product",
-            "wait-for-crash-collection",
-            "layout-test",
-            "dashboard-tests",
-            "archive-test-results",
-            "upload",
-            "extract-test-results",
-            "set-permissions",
-            "run-api-tests",
-            "lldb-webkit-test",
-            "webkitpy-test",
-            "webkitperl-test",
-            "bindings-generation-tests",
-            "builtins-generator-tests",
-            "trigger-crash-log-submission"
</del><ins>+        'Apple-BigSur-Release-WK2-Tests': [
+            'configure-build',
+            'configuration',
+            'clean-and-update-working-directory',
+            'show-identifier',
+            'kill-old-processes',
+            'delete-WebKitBuild-directory',
+            'delete-stale-build-files',
+            'download-built-product',
+            'extract-built-product',
+            'wait-for-crash-collection',
+            'layout-test',
+            'dashboard-tests',
+            'archive-test-results',
+            'upload',
+            'extract-test-results',
+            'set-permissions',
+            'run-api-tests',
+            'lldb-webkit-test',
+            'webkitpy-test',
+            'webkitperl-test',
+            'bindings-generation-tests',
+            'builtins-generator-tests',
+            'trigger-crash-log-submission'
</ins><span class="cx">         ],
</span><del>-        "Apple-BigSur-Release-WK2-WebGL-Tests": [
-            "configure-build",
-            "configuration",
-            "clean-and-update-working-directory",
-            "show-identifier",
-            "kill-old-processes",
-            "delete-WebKitBuild-directory",
-            "delete-stale-build-files",
-            "download-built-product",
-            "extract-built-product",
-            "wait-for-crash-collection",
-            "layout-test",
-            "dashboard-tests",
-            "archive-test-results",
-            "upload",
-            "extract-test-results",
-            "set-permissions",
-            "run-api-tests",
-            "lldb-webkit-test",
-            "webkitpy-test",
-            "webkitperl-test",
-            "bindings-generation-tests",
-            "builtins-generator-tests",
-            "trigger-crash-log-submission"
</del><ins>+        'Apple-BigSur-Release-WK2-WebGL-Tests': [
+            'configure-build',
+            'configuration',
+            'clean-and-update-working-directory',
+            'show-identifier',
+            'kill-old-processes',
+            'delete-WebKitBuild-directory',
+            'delete-stale-build-files',
+            'download-built-product',
+            'extract-built-product',
+            'wait-for-crash-collection',
+            'layout-test',
+            'dashboard-tests',
+            'archive-test-results',
+            'upload',
+            'extract-test-results',
+            'set-permissions',
+            'run-api-tests',
+            'lldb-webkit-test',
+            'webkitpy-test',
+            'webkitperl-test',
+            'bindings-generation-tests',
+            'builtins-generator-tests',
+            'trigger-crash-log-submission'
</ins><span class="cx">         ],
</span><del>-        "Apple-BigSur-Debug-Build": [
-            "configure-build",
-            "configuration",
-            "clean-and-update-working-directory",
-            "show-identifier",
-            "kill-old-processes",
-            "delete-WebKitBuild-directory",
-            "delete-stale-build-files",
-            "compile-webkit",
-            "archive-built-product",
-            "upload",
-            "archive-built-product",
-            "upload",
-            "transfer-to-s3",
-            "trigger"
</del><ins>+        'Apple-BigSur-Debug-Build': [
+            'configure-build',
+            'configuration',
+            'clean-and-update-working-directory',
+            'show-identifier',
+            'kill-old-processes',
+            'delete-WebKitBuild-directory',
+            'delete-stale-build-files',
+            'compile-webkit',
+            'archive-built-product',
+            'upload',
+            'archive-built-product',
+            'upload',
+            'transfer-to-s3',
+            'trigger'
</ins><span class="cx">         ],
</span><del>-        "Apple-BigSur-Debug-Test262-Tests": [
-            "configure-build",
-            "configuration",
-            "clean-and-update-working-directory",
-            "show-identifier",
-            "kill-old-processes",
-            "delete-WebKitBuild-directory",
-            "delete-stale-build-files",
-            "download-built-product",
-            "extract-built-product",
-            "test262-test"
</del><ins>+        'Apple-BigSur-Debug-Test262-Tests': [
+            'configure-build',
+            'configuration',
+            'clean-and-update-working-directory',
+            'show-identifier',
+            'kill-old-processes',
+            'delete-WebKitBuild-directory',
+            'delete-stale-build-files',
+            'download-built-product',
+            'extract-built-product',
+            'test262-test'
</ins><span class="cx">         ],
</span><del>-        "Apple-BigSur-Debug-WK1-Tests": [
-            "configure-build",
-            "configuration",
-            "clean-and-update-working-directory",
-            "show-identifier",
-            "kill-old-processes",
-            "delete-WebKitBuild-directory",
-            "delete-stale-build-files",
-            "download-built-product",
-            "extract-built-product",
-            "wait-for-crash-collection",
-            "layout-test",
-            "dashboard-tests",
-            "archive-test-results",
-            "upload",
-            "extract-test-results",
-            "set-permissions",
-            "run-api-tests",
-            "lldb-webkit-test",
-            "webkitpy-test",
-            "webkitperl-test",
-            "bindings-generation-tests",
-            "builtins-generator-tests",
-            "trigger-crash-log-submission"
</del><ins>+        'Apple-BigSur-Debug-WK1-Tests': [
+            'configure-build',
+            'configuration',
+            'clean-and-update-working-directory',
+            'show-identifier',
+            'kill-old-processes',
+            'delete-WebKitBuild-directory',
+            'delete-stale-build-files',
+            'download-built-product',
+            'extract-built-product',
+            'wait-for-crash-collection',
+            'layout-test',
+            'dashboard-tests',
+            'archive-test-results',
+            'upload',
+            'extract-test-results',
+            'set-permissions',
+            'run-api-tests',
+            'lldb-webkit-test',
+            'webkitpy-test',
+            'webkitperl-test',
+            'bindings-generation-tests',
+            'builtins-generator-tests',
+            'trigger-crash-log-submission'
</ins><span class="cx">         ],
</span><del>-        "Apple-BigSur-Debug-WK2-Tests": [
-            "configure-build",
-            "configuration",
-            "clean-and-update-working-directory",
-            "show-identifier",
-            "kill-old-processes",
-            "delete-WebKitBuild-directory",
-            "delete-stale-build-files",
-            "download-built-product",
-            "extract-built-product",
-            "wait-for-crash-collection",
-            "layout-test",
-            "dashboard-tests",
-            "archive-test-results",
-            "upload",
-            "extract-test-results",
-            "set-permissions",
-            "run-api-tests",
-            "lldb-webkit-test",
-            "webkitpy-test",
-            "webkitperl-test",
-            "bindings-generation-tests",
-            "builtins-generator-tests",
-            "trigger-crash-log-submission"
</del><ins>+        'Apple-BigSur-Debug-WK2-Tests': [
+            'configure-build',
+            'configuration',
+            'clean-and-update-working-directory',
+            'show-identifier',
+            'kill-old-processes',
+            'delete-WebKitBuild-directory',
+            'delete-stale-build-files',
+            'download-built-product',
+            'extract-built-product',
+            'wait-for-crash-collection',
+            'layout-test',
+            'dashboard-tests',
+            'archive-test-results',
+            'upload',
+            'extract-test-results',
+            'set-permissions',
+            'run-api-tests',
+            'lldb-webkit-test',
+            'webkitpy-test',
+            'webkitperl-test',
+            'bindings-generation-tests',
+            'builtins-generator-tests',
+            'trigger-crash-log-submission'
</ins><span class="cx">         ],
</span><del>-        "Apple-BigSur-Debug-AppleSilicon-WK1-Tests": [
-            "configure-build",
-            "configuration",
-            "clean-and-update-working-directory",
-            "show-identifier",
-            "kill-old-processes",
-            "delete-WebKitBuild-directory",
-            "delete-stale-build-files",
-            "download-built-product",
-            "extract-built-product",
-            "wait-for-crash-collection",
-            "layout-test",
-            "dashboard-tests",
-            "archive-test-results",
-            "upload",
-            "extract-test-results",
-            "set-permissions",
-            "run-api-tests",
-            "lldb-webkit-test",
-            "webkitpy-test",
-            "webkitperl-test",
-            "bindings-generation-tests",
-            "builtins-generator-tests",
-            "trigger-crash-log-submission"
</del><ins>+        'Apple-BigSur-Debug-AppleSilicon-WK1-Tests': [
+            'configure-build',
+            'configuration',
+            'clean-and-update-working-directory',
+            'show-identifier',
+            'kill-old-processes',
+            'delete-WebKitBuild-directory',
+            'delete-stale-build-files',
+            'download-built-product',
+            'extract-built-product',
+            'wait-for-crash-collection',
+            'layout-test',
+            'dashboard-tests',
+            'archive-test-results',
+            'upload',
+            'extract-test-results',
+            'set-permissions',
+            'run-api-tests',
+            'lldb-webkit-test',
+            'webkitpy-test',
+            'webkitperl-test',
+            'bindings-generation-tests',
+            'builtins-generator-tests',
+            'trigger-crash-log-submission'
</ins><span class="cx">         ],
</span><del>-        "Apple-BigSur-Debug-AppleSilicon-WK2-Tests": [
-            "configure-build",
-            "configuration",
-            "clean-and-update-working-directory",
-            "show-identifier",
-            "kill-old-processes",
-            "delete-WebKitBuild-directory",
-            "delete-stale-build-files",
-            "download-built-product",
-            "extract-built-product",
-            "wait-for-crash-collection",
-            "layout-test",
-            "dashboard-tests",
-            "archive-test-results",
-            "upload",
-            "extract-test-results",
-            "set-permissions",
-            "run-api-tests",
-            "lldb-webkit-test",
-            "webkitpy-test",
-            "webkitperl-test",
-            "bindings-generation-tests",
-            "builtins-generator-tests",
-            "trigger-crash-log-submission"
</del><ins>+        'Apple-BigSur-Debug-AppleSilicon-WK2-Tests': [
+            'configure-build',
+            'configuration',
+            'clean-and-update-working-directory',
+            'show-identifier',
+            'kill-old-processes',
+            'delete-WebKitBuild-directory',
+            'delete-stale-build-files',
+            'download-built-product',
+            'extract-built-product',
+            'wait-for-crash-collection',
+            'layout-test',
+            'dashboard-tests',
+            'archive-test-results',
+            'upload',
+            'extract-test-results',
+            'set-permissions',
+            'run-api-tests',
+            'lldb-webkit-test',
+            'webkitpy-test',
+            'webkitperl-test',
+            'bindings-generation-tests',
+            'builtins-generator-tests',
+            'trigger-crash-log-submission'
</ins><span class="cx">         ],
</span><del>-        "Apple-BigSur-AppleSilicon-Debug-JSC-Tests": [
-            "configure-build",
-            "configuration",
-            "clean-and-update-working-directory",
-            "show-identifier",
-            "kill-old-processes",
-            "delete-WebKitBuild-directory",
-            "delete-stale-build-files",
-            "download-built-product",
-            "extract-built-product",
-            "jscore-test"
</del><ins>+        'Apple-BigSur-AppleSilicon-Debug-JSC-Tests': [
+            'configure-build',
+            'configuration',
+            'clean-and-update-working-directory',
+            'show-identifier',
+            'kill-old-processes',
+            'delete-WebKitBuild-directory',
+            'delete-stale-build-files',
+            'download-built-product',
+            'extract-built-product',
+            'jscore-test'
</ins><span class="cx">         ],
</span><del>-        "Apple-BigSur-AppleSilicon-Release-JSC-Tests": [
-            "configure-build",
-            "configuration",
-            "clean-and-update-working-directory",
-            "show-identifier",
-            "kill-old-processes",
-            "delete-WebKitBuild-directory",
-            "delete-stale-build-files",
-            "download-built-product",
-            "extract-built-product",
-            "jscore-test"
</del><ins>+        'Apple-BigSur-AppleSilicon-Release-JSC-Tests': [
+            'configure-build',
+            'configuration',
+            'clean-and-update-working-directory',
+            'show-identifier',
+            'kill-old-processes',
+            'delete-WebKitBuild-directory',
+            'delete-stale-build-files',
+            'download-built-product',
+            'extract-built-product',
+            'jscore-test'
</ins><span class="cx">         ],
</span><del>-        "Apple-Catalina-Debug-Build": [
-            "configure-build",
-            "configuration",
-            "clean-and-update-working-directory",
-            "show-identifier",
-            "kill-old-processes",
-            "delete-WebKitBuild-directory",
-            "delete-stale-build-files",
-            "compile-webkit",
-            "archive-built-product",
-            "upload",
-            "archive-built-product",
-            "upload",
-            "transfer-to-s3",
-            "trigger"
</del><ins>+        'Apple-Catalina-Debug-Build': [
+            'configure-build',
+            'configuration',
+            'clean-and-update-working-directory',
+            'show-identifier',
+            'kill-old-processes',
+            'delete-WebKitBuild-directory',
+            'delete-stale-build-files',
+            'compile-webkit',
+            'archive-built-product',
+            'upload',
+            'archive-built-product',
+            'upload',
+            'transfer-to-s3',
+            'trigger'
</ins><span class="cx">         ],
</span><del>-        "Apple-Catalina-Debug-WK1-Tests": [
-            "configure-build",
-            "configuration",
-            "clean-and-update-working-directory",
-            "show-identifier",
-            "kill-old-processes",
-            "delete-WebKitBuild-directory",
-            "delete-stale-build-files",
-            "download-built-product",
-            "extract-built-product",
-            "wait-for-crash-collection",
-            "layout-test",
-            "dashboard-tests",
-            "archive-test-results",
-            "upload",
-            "extract-test-results",
-            "set-permissions",
-            "run-api-tests",
-            "webkitpy-test",
-            "webkitperl-test",
-            "bindings-generation-tests",
-            "builtins-generator-tests",
-            "trigger-crash-log-submission"
</del><ins>+        'Apple-Catalina-Debug-WK1-Tests': [
+            'configure-build',
+            'configuration',
+            'clean-and-update-working-directory',
+            'show-identifier',
+            'kill-old-processes',
+            'delete-WebKitBuild-directory',
+            'delete-stale-build-files',
+            'download-built-product',
+            'extract-built-product',
+            'wait-for-crash-collection',
+            'layout-test',
+            'dashboard-tests',
+            'archive-test-results',
+            'upload',
+            'extract-test-results',
+            'set-permissions',
+            'run-api-tests',
+            'webkitpy-test',
+            'webkitperl-test',
+            'bindings-generation-tests',
+            'builtins-generator-tests',
+            'trigger-crash-log-submission'
</ins><span class="cx">         ],
</span><del>-        "Apple-Catalina-Debug-WK2-Tests": [
-            "configure-build",
-            "configuration",
-            "clean-and-update-working-directory",
-            "show-identifier",
-            "kill-old-processes",
-            "delete-WebKitBuild-directory",
-            "delete-stale-build-files",
-            "download-built-product",
-            "extract-built-product",
-            "wait-for-crash-collection",
-            "layout-test",
-            "dashboard-tests",
-            "archive-test-results",
-            "upload",
-            "extract-test-results",
-            "set-permissions",
-            "run-api-tests",
-            "webkitpy-test",
-            "webkitperl-test",
-            "bindings-generation-tests",
-            "builtins-generator-tests",
-            "trigger-crash-log-submission"
</del><ins>+        'Apple-Catalina-Debug-WK2-Tests': [
+            'configure-build',
+            'configuration',
+            'clean-and-update-working-directory',
+            'show-identifier',
+            'kill-old-processes',
+            'delete-WebKitBuild-directory',
+            'delete-stale-build-files',
+            'download-built-product',
+            'extract-built-product',
+            'wait-for-crash-collection',
+            'layout-test',
+            'dashboard-tests',
+            'archive-test-results',
+            'upload',
+            'extract-test-results',
+            'set-permissions',
+            'run-api-tests',
+            'webkitpy-test',
+            'webkitperl-test',
+            'bindings-generation-tests',
+            'builtins-generator-tests',
+            'trigger-crash-log-submission'
</ins><span class="cx">         ],
</span><del>-        "Apple-Catalina-Debug-WK2-GPUProcess-Tests": [
-            "configure-build",
-            "configuration",
-            "clean-and-update-working-directory",
-            "show-identifier",
-            "kill-old-processes",
-            "delete-WebKitBuild-directory",
-            "delete-stale-build-files",
-            "download-built-product",
-            "extract-built-product",
-            "wait-for-crash-collection",
-            "layout-test",
-            "dashboard-tests",
-            "archive-test-results",
-            "upload",
-            "extract-test-results",
-            "set-permissions",
-            "run-api-tests",
-            "webkitpy-test",
-            "webkitperl-test",
-            "bindings-generation-tests",
-            "builtins-generator-tests",
-            "trigger-crash-log-submission"
</del><ins>+        'Apple-Catalina-Debug-WK2-GPUProcess-Tests': [
+            'configure-build',
+            'configuration',
+            'clean-and-update-working-directory',
+            'show-identifier',
+            'kill-old-processes',
+            'delete-WebKitBuild-directory',
+            'delete-stale-build-files',
+            'download-built-product',
+            'extract-built-product',
+            'wait-for-crash-collection',
+            'layout-test',
+            'dashboard-tests',
+            'archive-test-results',
+            'upload',
+            'extract-test-results',
+            'set-permissions',
+            'run-api-tests',
+            'webkitpy-test',
+            'webkitperl-test',
+            'bindings-generation-tests',
+            'builtins-generator-tests',
+            'trigger-crash-log-submission'
</ins><span class="cx">         ],
</span><del>-        "Apple-Catalina-Release-Build": [
-            "configure-build",
-            "configuration",
-            "clean-and-update-working-directory",
-            "show-identifier",
-            "kill-old-processes",
-            "delete-WebKitBuild-directory",
-            "delete-stale-build-files",
-            "compile-webkit",
-            "archive-built-product",
-            "upload",
-            "archive-built-product",
-            "upload",
-            "transfer-to-s3",
-            "trigger"
</del><ins>+        'Apple-Catalina-Release-Build': [
+            'configure-build',
+            'configuration',
+            'clean-and-update-working-directory',
+            'show-identifier',
+            'kill-old-processes',
+            'delete-WebKitBuild-directory',
+            'delete-stale-build-files',
+            'compile-webkit',
+            'archive-built-product',
+            'upload',
+            'archive-built-product',
+            'upload',
+            'transfer-to-s3',
+            'trigger'
</ins><span class="cx">         ],
</span><del>-        "Apple-Catalina-Release-WK1-Tests": [
-            "configure-build",
-            "configuration",
-            "clean-and-update-working-directory",
-            "show-identifier",
-            "kill-old-processes",
-            "delete-WebKitBuild-directory",
-            "delete-stale-build-files",
-            "download-built-product",
-            "extract-built-product",
-            "wait-for-crash-collection",
-            "layout-test",
-            "dashboard-tests",
-            "archive-test-results",
-            "upload",
-            "extract-test-results",
-            "set-permissions",
-            "run-api-tests",
-            "webkitpy-test",
-            "webkitperl-test",
-            "bindings-generation-tests",
-            "builtins-generator-tests",
-            "trigger-crash-log-submission"
</del><ins>+        'Apple-Catalina-Release-WK1-Tests': [
+            'configure-build',
+            'configuration',
+            'clean-and-update-working-directory',
+            'show-identifier',
+            'kill-old-processes',
+            'delete-WebKitBuild-directory',
+            'delete-stale-build-files',
+            'download-built-product',
+            'extract-built-product',
+            'wait-for-crash-collection',
+            'layout-test',
+            'dashboard-tests',
+            'archive-test-results',
+            'upload',
+            'extract-test-results',
+            'set-permissions',
+            'run-api-tests',
+            'webkitpy-test',
+            'webkitperl-test',
+            'bindings-generation-tests',
+            'builtins-generator-tests',
+            'trigger-crash-log-submission'
</ins><span class="cx">         ],
</span><del>-        "Apple-Catalina-Release-WK2-Tests": [
-            "configure-build",
-            "configuration",
-            "clean-and-update-working-directory",
-            "show-identifier",
-            "kill-old-processes",
-            "delete-WebKitBuild-directory",
-            "delete-stale-build-files",
-            "download-built-product",
-            "extract-built-product",
-            "wait-for-crash-collection",
-            "layout-test",
-            "dashboard-tests",
-            "archive-test-results",
-            "upload",
-            "extract-test-results",
-            "set-permissions",
-            "run-api-tests",
-            "webkitpy-test",
-            "webkitperl-test",
-            "bindings-generation-tests",
-            "builtins-generator-tests",
-            "trigger-crash-log-submission"
</del><ins>+        'Apple-Catalina-Release-WK2-Tests': [
+            'configure-build',
+            'configuration',
+            'clean-and-update-working-directory',
+            'show-identifier',
+            'kill-old-processes',
+            'delete-WebKitBuild-directory',
+            'delete-stale-build-files',
+            'download-built-product',
+            'extract-built-product',
+            'wait-for-crash-collection',
+            'layout-test',
+            'dashboard-tests',
+            'archive-test-results',
+            'upload',
+            'extract-test-results',
+            'set-permissions',
+            'run-api-tests',
+            'webkitpy-test',
+            'webkitperl-test',
+            'bindings-generation-tests',
+            'builtins-generator-tests',
+            'trigger-crash-log-submission'
</ins><span class="cx">         ],
</span><del>-        "Apple-Catalina-Debug-JSC-Tests": [
-            "configure-build",
-            "configuration",
-            "clean-and-update-working-directory",
-            "show-identifier",
-            "kill-old-processes",
-            "delete-WebKitBuild-directory",
-            "delete-stale-build-files",
-            "download-built-product",
-            "extract-built-product",
-            "jscore-test"
</del><ins>+        'Apple-Catalina-Debug-JSC-Tests': [
+            'configure-build',
+            'configuration',
+            'clean-and-update-working-directory',
+            'show-identifier',
+            'kill-old-processes',
+            'delete-WebKitBuild-directory',
+            'delete-stale-build-files',
+            'download-built-product',
+            'extract-built-product',
+            'jscore-test'
</ins><span class="cx">         ],
</span><del>-        "Apple-Catalina-Release-JSC-Tests": [
-            "configure-build",
-            "configuration",
-            "clean-and-update-working-directory",
-            "show-identifier",
-            "kill-old-processes",
-            "delete-WebKitBuild-directory",
-            "delete-stale-build-files",
-            "download-built-product",
-            "extract-built-product",
-            "jscore-test"
</del><ins>+        'Apple-Catalina-Release-JSC-Tests': [
+            'configure-build',
+            'configuration',
+            'clean-and-update-working-directory',
+            'show-identifier',
+            'kill-old-processes',
+            'delete-WebKitBuild-directory',
+            'delete-stale-build-files',
+            'download-built-product',
+            'extract-built-product',
+            'jscore-test'
</ins><span class="cx">         ],
</span><del>-        "Apple-Catalina-LLINT-CLoop-BuildAndTest": [
-            "configure-build",
-            "configuration",
-            "clean-and-update-working-directory",
-            "show-identifier",
-            "kill-old-processes",
-            "delete-WebKitBuild-directory",
-            "delete-stale-build-files",
-            "compile-webkit",
-            "webkit-jsc-cloop-test"
</del><ins>+        'Apple-Catalina-LLINT-CLoop-BuildAndTest': [
+            'configure-build',
+            'configuration',
+            'clean-and-update-working-directory',
+            'show-identifier',
+            'kill-old-processes',
+            'delete-WebKitBuild-directory',
+            'delete-stale-build-files',
+            'compile-webkit',
+            'webkit-jsc-cloop-test'
</ins><span class="cx">         ],
</span><del>-        "Apple-Catalina-Release-WK2-Perf": [
-            "configure-build",
-            "configuration",
-            "clean-and-update-working-directory",
-            "show-identifier",
-            "kill-old-processes",
-            "delete-WebKitBuild-directory",
-            "delete-stale-build-files",
-            "download-built-product",
-            "extract-built-product",
-            "perf-test"
</del><ins>+        'Apple-Catalina-Release-WK2-Perf': [
+            'configure-build',
+            'configuration',
+            'clean-and-update-working-directory',
+            'show-identifier',
+            'kill-old-processes',
+            'delete-WebKitBuild-directory',
+            'delete-stale-build-files',
+            'download-built-product',
+            'extract-built-product',
+            'perf-test'
</ins><span class="cx">         ],
</span><del>-        "Apple-iOS-14-Release-Build": [
-            "configure-build",
-            "configuration",
-            "clean-and-update-working-directory",
-            "show-identifier",
-            "kill-old-processes",
-            "delete-WebKitBuild-directory",
-            "delete-stale-build-files",
-            "compile-webkit"
</del><ins>+        'Apple-iOS-14-Release-Build': [
+            'configure-build',
+            'configuration',
+            'clean-and-update-working-directory',
+            'show-identifier',
+            'kill-old-processes',
+            'delete-WebKitBuild-directory',
+            'delete-stale-build-files',
+            'compile-webkit'
</ins><span class="cx">         ],
</span><del>-        "Apple-iOS-14-Simulator-Release-Build": [
-            "configure-build",
-            "configuration",
-            "clean-and-update-working-directory",
-            "show-identifier",
-            "kill-old-processes",
-            "delete-WebKitBuild-directory",
-            "delete-stale-build-files",
-            "compile-webkit",
-            "archive-built-product",
-            "upload",
-            "archive-built-product",
-            "upload",
-            "transfer-to-s3",
-            "trigger"
</del><ins>+        'Apple-iOS-14-Simulator-Release-Build': [
+            'configure-build',
+            'configuration',
+            'clean-and-update-working-directory',
+            'show-identifier',
+            'kill-old-processes',
+            'delete-WebKitBuild-directory',
+            'delete-stale-build-files',
+            'compile-webkit',
+            'archive-built-product',
+            'upload',
+            'archive-built-product',
+            'upload',
+            'transfer-to-s3',
+            'trigger'
</ins><span class="cx">         ],
</span><del>-        "Apple-iOS-14-Simulator-Debug-Build": [
-            "configure-build",
-            "configuration",
-            "clean-and-update-working-directory",
-            "show-identifier",
-            "kill-old-processes",
-            "delete-WebKitBuild-directory",
-            "delete-stale-build-files",
-            "compile-webkit",
-            "archive-built-product",
-            "upload",
-            "archive-built-product",
-            "upload",
-            "transfer-to-s3",
-            "trigger"
</del><ins>+        'Apple-iOS-14-Simulator-Debug-Build': [
+            'configure-build',
+            'configuration',
+            'clean-and-update-working-directory',
+            'show-identifier',
+            'kill-old-processes',
+            'delete-WebKitBuild-directory',
+            'delete-stale-build-files',
+            'compile-webkit',
+            'archive-built-product',
+            'upload',
+            'archive-built-product',
+            'upload',
+            'transfer-to-s3',
+            'trigger'
</ins><span class="cx">         ],
</span><del>-        "Apple-iOS-14-Simulator-Release-WK2-Tests": [
-            "configure-build",
-            "configuration",
-            "clean-and-update-working-directory",
-            "show-identifier",
-            "kill-old-processes",
-            "delete-WebKitBuild-directory",
-            "delete-stale-build-files",
-            "download-built-product",
-            "extract-built-product",
-            "wait-for-crash-collection",
-            "layout-test",
-            "dashboard-tests",
-            "archive-test-results",
-            "upload",
-            "extract-test-results",
-            "set-permissions",
-            "run-api-tests",
-            "webkitpy-test",
-            "webkitperl-test",
-            "bindings-generation-tests",
-            "builtins-generator-tests",
-            "trigger-crash-log-submission"
</del><ins>+        'Apple-iOS-14-Simulator-Release-WK2-Tests': [
+            'configure-build',
+            'configuration',
+            'clean-and-update-working-directory',
+            'show-identifier',
+            'kill-old-processes',
+            'delete-WebKitBuild-directory',
+            'delete-stale-build-files',
+            'download-built-product',
+            'extract-built-product',
+            'wait-for-crash-collection',
+            'layout-test',
+            'dashboard-tests',
+            'archive-test-results',
+            'upload',
+            'extract-test-results',
+            'set-permissions',
+            'run-api-tests',
+            'webkitpy-test',
+            'webkitperl-test',
+            'bindings-generation-tests',
+            'builtins-generator-tests',
+            'trigger-crash-log-submission'
</ins><span class="cx">         ],
</span><del>-        "Apple-iOS-14-Simulator-Debug-WK2-Tests": [
-            "configure-build",
-            "configuration",
-            "clean-and-update-working-directory",
-            "show-identifier",
-            "kill-old-processes",
-            "delete-WebKitBuild-directory",
-            "delete-stale-build-files",
-            "download-built-product",
-            "extract-built-product",
-            "wait-for-crash-collection",
-            "layout-test",
-            "dashboard-tests",
-            "archive-test-results",
-            "upload",
-            "extract-test-results",
-            "set-permissions",
-            "run-api-tests",
-            "webkitpy-test",
-            "webkitperl-test",
-            "bindings-generation-tests",
-            "builtins-generator-tests",
-            "trigger-crash-log-submission"
</del><ins>+        'Apple-iOS-14-Simulator-Debug-WK2-Tests': [
+            'configure-build',
+            'configuration',
+            'clean-and-update-working-directory',
+            'show-identifier',
+            'kill-old-processes',
+            'delete-WebKitBuild-directory',
+            'delete-stale-build-files',
+            'download-built-product',
+            'extract-built-product',
+            'wait-for-crash-collection',
+            'layout-test',
+            'dashboard-tests',
+            'archive-test-results',
+            'upload',
+            'extract-test-results',
+            'set-permissions',
+            'run-api-tests',
+            'webkitpy-test',
+            'webkitperl-test',
+            'bindings-generation-tests',
+            'builtins-generator-tests',
+            'trigger-crash-log-submission'
</ins><span class="cx">         ],
</span><del>-        "Apple-iPadOS-14-Simulator-Release-WK2-Tests": [
-            "configure-build",
-            "configuration",
-            "clean-and-update-working-directory",
-            "show-identifier",
-            "kill-old-processes",
-            "delete-WebKitBuild-directory",
-            "delete-stale-build-files",
-            "download-built-product",
-            "extract-built-product",
-            "wait-for-crash-collection",
-            "layout-test",
-            "dashboard-tests",
-            "archive-test-results",
-            "upload",
-            "extract-test-results",
-            "set-permissions",
-            "run-api-tests",
-            "webkitpy-test",
-            "webkitperl-test",
-            "bindings-generation-tests",
-            "builtins-generator-tests",
-            "trigger-crash-log-submission"
</del><ins>+        'Apple-iPadOS-14-Simulator-Release-WK2-Tests': [
+            'configure-build',
+            'configuration',
+            'clean-and-update-working-directory',
+            'show-identifier',
+            'kill-old-processes',
+            'delete-WebKitBuild-directory',
+            'delete-stale-build-files',
+            'download-built-product',
+            'extract-built-product',
+            'wait-for-crash-collection',
+            'layout-test',
+            'dashboard-tests',
+            'archive-test-results',
+            'upload',
+            'extract-test-results',
+            'set-permissions',
+            'run-api-tests',
+            'webkitpy-test',
+            'webkitperl-test',
+            'bindings-generation-tests',
+            'builtins-generator-tests',
+            'trigger-crash-log-submission'
</ins><span class="cx">         ],
</span><del>-        "Apple-iPadOS-14-Simulator-Debug-WK2-Tests": [
-            "configure-build",
-            "configuration",
-            "clean-and-update-working-directory",
-            "show-identifier",
-            "kill-old-processes",
-            "delete-WebKitBuild-directory",
-            "delete-stale-build-files",
-            "download-built-product",
-            "extract-built-product",
-            "wait-for-crash-collection",
-            "layout-test",
-            "dashboard-tests",
-            "archive-test-results",
-            "upload",
-            "extract-test-results",
-            "set-permissions",
-            "run-api-tests",
-            "webkitpy-test",
-            "webkitperl-test",
-            "bindings-generation-tests",
-            "builtins-generator-tests",
-            "trigger-crash-log-submission"
</del><ins>+        'Apple-iPadOS-14-Simulator-Debug-WK2-Tests': [
+            'configure-build',
+            'configuration',
+            'clean-and-update-working-directory',
+            'show-identifier',
+            'kill-old-processes',
+            'delete-WebKitBuild-directory',
+            'delete-stale-build-files',
+            'download-built-product',
+            'extract-built-product',
+            'wait-for-crash-collection',
+            'layout-test',
+            'dashboard-tests',
+            'archive-test-results',
+            'upload',
+            'extract-test-results',
+            'set-permissions',
+            'run-api-tests',
+            'webkitpy-test',
+            'webkitperl-test',
+            'bindings-generation-tests',
+            'builtins-generator-tests',
+            'trigger-crash-log-submission'
</ins><span class="cx">         ],
</span><del>-        "Apple-tvOS-14-Release-Build": [
-            "configure-build",
-            "configuration",
-            "clean-and-update-working-directory",
-            "show-identifier",
-            "kill-old-processes",
-            "delete-WebKitBuild-directory",
-            "delete-stale-build-files",
-            "compile-webkit"
</del><ins>+        'Apple-tvOS-14-Release-Build': [
+            'configure-build',
+            'configuration',
+            'clean-and-update-working-directory',
+            'show-identifier',
+            'kill-old-processes',
+            'delete-WebKitBuild-directory',
+            'delete-stale-build-files',
+            'compile-webkit'
</ins><span class="cx">         ],
</span><del>-        "Apple-tvOS-Simulator-14-Release-Build": [
-            "configure-build",
-            "configuration",
-            "clean-and-update-working-directory",
-            "show-identifier",
-            "kill-old-processes",
-            "delete-WebKitBuild-directory",
-            "delete-stale-build-files",
-            "compile-webkit"
</del><ins>+        'Apple-tvOS-Simulator-14-Release-Build': [
+            'configure-build',
+            'configuration',
+            'clean-and-update-working-directory',
+            'show-identifier',
+            'kill-old-processes',
+            'delete-WebKitBuild-directory',
+            'delete-stale-build-files',
+            'compile-webkit'
</ins><span class="cx">         ],
</span><del>-        "Apple-watchOS-7-Release-Build": [
-            "configure-build",
-            "configuration",
-            "clean-and-update-working-directory",
-            "show-identifier",
-            "kill-old-processes",
-            "delete-WebKitBuild-directory",
-            "delete-stale-build-files",
-            "compile-webkit"
</del><ins>+        'Apple-watchOS-7-Release-Build': [
+            'configure-build',
+            'configuration',
+            'clean-and-update-working-directory',
+            'show-identifier',
+            'kill-old-processes',
+            'delete-WebKitBuild-directory',
+            'delete-stale-build-files',
+            'compile-webkit'
</ins><span class="cx">         ],
</span><del>-        "Apple-watchOS-Simulator-7-Release-Build": [
-            "configure-build",
-            "configuration",
-            "clean-and-update-working-directory",
-            "show-identifier",
-            "kill-old-processes",
-            "delete-WebKitBuild-directory",
-            "delete-stale-build-files",
-            "compile-webkit"
</del><ins>+        'Apple-watchOS-Simulator-7-Release-Build': [
+            'configure-build',
+            'configuration',
+            'clean-and-update-working-directory',
+            'show-identifier',
+            'kill-old-processes',
+            'delete-WebKitBuild-directory',
+            'delete-stale-build-files',
+            'compile-webkit'
</ins><span class="cx">         ],
</span><del>-        "Apple-Win-10-Release-Build": [
-            "configure-build",
-            "configuration",
-            "clean-and-update-working-directory",
-            "show-identifier",
-            "kill-old-processes",
-            "delete-WebKitBuild-directory",
-            "delete-stale-build-files",
-            "compile",
-            "compile-webkit",
-            "archive-built-product",
-            "upload",
-            "transfer-to-s3",
-            "trigger"
</del><ins>+        'Apple-Win-10-Release-Build': [
+            'configure-build',
+            'configuration',
+            'clean-and-update-working-directory',
+            'show-identifier',
+            'kill-old-processes',
+            'delete-WebKitBuild-directory',
+            'delete-stale-build-files',
+            'compile',
+            'compile-webkit',
+            'archive-built-product',
+            'upload',
+            'transfer-to-s3',
+            'trigger'
</ins><span class="cx">         ],
</span><del>-        "Apple-Win-10-Debug-Build": [
-            "configure-build",
-            "configuration",
-            "clean-and-update-working-directory",
-            "show-identifier",
-            "kill-old-processes",
-            "delete-WebKitBuild-directory",
-            "delete-stale-build-files",
-            "compile",
-            "compile-webkit",
-            "archive-built-product",
-            "upload",
-            "transfer-to-s3",
-            "trigger"
</del><ins>+        'Apple-Win-10-Debug-Build': [
+            'configure-build',
+            'configuration',
+            'clean-and-update-working-directory',
+            'show-identifier',
+            'kill-old-processes',
+            'delete-WebKitBuild-directory',
+            'delete-stale-build-files',
+            'compile',
+            'compile-webkit',
+            'archive-built-product',
+            'upload',
+            'transfer-to-s3',
+            'trigger'
</ins><span class="cx">         ],
</span><del>-        "Apple-Win-10-Release-Tests": [
-            "configure-build",
-            "configuration",
-            "clean-and-update-working-directory",
-            "show-identifier",
-            "kill-old-processes",
-            "delete-WebKitBuild-directory",
-            "delete-stale-build-files",
-            "compile",
-            "download-built-product",
-            "extract-built-product",
-            "jscore-test",
-            "layout-test",
-            "archive-test-results",
-            "upload",
-            "extract-test-results",
-            "set-permissions",
-            "run-api-tests",
-            "webkitpy-test",
-            "webkitperl-test",
-            "bindings-generation-tests",
-            "builtins-generator-tests"
</del><ins>+        'Apple-Win-10-Release-Tests': [
+            'configure-build',
+            'configuration',
+            'clean-and-update-working-directory',
+            'show-identifier',
+            'kill-old-processes',
+            'delete-WebKitBuild-directory',
+            'delete-stale-build-files',
+            'compile',
+            'download-built-product',
+            'extract-built-product',
+            'jscore-test',
+            'layout-test',
+            'archive-test-results',
+            'upload',
+            'extract-test-results',
+            'set-permissions',
+            'run-api-tests',
+            'webkitpy-test',
+            'webkitperl-test',
+            'bindings-generation-tests',
+            'builtins-generator-tests'
</ins><span class="cx">         ],
</span><del>-        "Apple-Win-10-Debug-Tests": [
-            "configure-build",
-            "configuration",
-            "clean-and-update-working-directory",
-            "show-identifier",
-            "kill-old-processes",
-            "delete-WebKitBuild-directory",
-            "delete-stale-build-files",
-            "compile",
-            "download-built-product",
-            "extract-built-product",
-            "jscore-test",
-            "layout-test",
-            "archive-test-results",
-            "upload",
-            "extract-test-results",
-            "set-permissions",
-            "run-api-tests",
-            "webkitpy-test",
-            "webkitperl-test",
-            "bindings-generation-tests",
-            "builtins-generator-tests"
</del><ins>+        'Apple-Win-10-Debug-Tests': [
+            'configure-build',
+            'configuration',
+            'clean-and-update-working-directory',
+            'show-identifier',
+            'kill-old-processes',
+            'delete-WebKitBuild-directory',
+            'delete-stale-build-files',
+            'compile',
+            'download-built-product',
+            'extract-built-product',
+            'jscore-test',
+            'layout-test',
+            'archive-test-results',
+            'upload',
+            'extract-test-results',
+            'set-permissions',
+            'run-api-tests',
+            'webkitpy-test',
+            'webkitperl-test',
+            'bindings-generation-tests',
+            'builtins-generator-tests'
</ins><span class="cx">         ],
</span><del>-        "GTK-Linux-64-bit-Release-Build": [
-            "configure-build",
-            "configuration",
-            "clean-and-update-working-directory",
-            "show-identifier",
-            "kill-old-processes",
-            "delete-WebKitBuild-directory",
-            "delete-stale-build-files",
-            "jhbuild",
-            "compile-webkit",
-            "generate-jsc-bundle",
-            "install-built-product",
-            "archive-built-product",
-            "upload",
-            "transfer-to-s3",
-            "trigger"
</del><ins>+        'GTK-Linux-64-bit-Release-Build': [
+            'configure-build',
+            'configuration',
+            'clean-and-update-working-directory',
+            'show-identifier',
+            'kill-old-processes',
+            'delete-WebKitBuild-directory',
+            'delete-stale-build-files',
+            'jhbuild',
+            'compile-webkit',
+            'generate-jsc-bundle',
+            'install-built-product',
+            'archive-built-product',
+            'upload',
+            'transfer-to-s3',
+            'trigger'
</ins><span class="cx">         ],
</span><del>-        "GTK-Linux-64-bit-Release-Tests": [
-            "configure-build",
-            "configuration",
-            "clean-and-update-working-directory",
-            "show-identifier",
-            "kill-old-processes",
-            "delete-WebKitBuild-directory",
-            "delete-stale-build-files",
-            "jhbuild",
-            "download-built-product",
-            "extract-built-product",
-            "layout-test",
-            "dashboard-tests",
-            "archive-test-results",
-            "upload",
-            "extract-test-results",
-            "set-permissions",
-            "webkitpy-test",
-            "webkitperl-test",
-            "bindings-generation-tests",
-            "builtins-generator-tests",
-            "API-tests"
</del><ins>+        'GTK-Linux-64-bit-Release-Tests': [
+            'configure-build',
+            'configuration',
+            'clean-and-update-working-directory',
+            'show-identifier',
+            'kill-old-processes',
+            'delete-WebKitBuild-directory',
+            'delete-stale-build-files',
+            'jhbuild',
+            'download-built-product',
+            'extract-built-product',
+            'layout-test',
+            'dashboard-tests',
+            'archive-test-results',
+            'upload',
+            'extract-test-results',
+            'set-permissions',
+            'webkitpy-test',
+            'webkitperl-test',
+            'bindings-generation-tests',
+            'builtins-generator-tests',
+            'API-tests'
</ins><span class="cx">         ],
</span><del>-        "GTK-Linux-64-bit-Release-JS-Tests": [
-            "configure-build",
-            "configuration",
-            "clean-and-update-working-directory",
-            "show-identifier",
-            "kill-old-processes",
-            "delete-WebKitBuild-directory",
-            "delete-stale-build-files",
-            "jhbuild",
-            "download-built-product",
-            "extract-built-product",
-            "jscore-test",
-            "test262-test"
</del><ins>+        'GTK-Linux-64-bit-Release-JS-Tests': [
+            'configure-build',
+            'configuration',
+            'clean-and-update-working-directory',
+            'show-identifier',
+            'kill-old-processes',
+            'delete-WebKitBuild-directory',
+            'delete-stale-build-files',
+            'jhbuild',
+            'download-built-product',
+            'extract-built-product',
+            'jscore-test',
+            'test262-test'
</ins><span class="cx">         ],
</span><del>-        "GTK-Linux-64-bit-Release-WebDriver-Tests": [
-            "configure-build",
-            "configuration",
-            "clean-and-update-working-directory",
-            "show-identifier",
-            "kill-old-processes",
-            "delete-WebKitBuild-directory",
-            "delete-stale-build-files",
-            "jhbuild",
-            "download-built-product",
-            "extract-built-product",
-            "webdriver-test"
</del><ins>+        'GTK-Linux-64-bit-Release-WebDriver-Tests': [
+            'configure-build',
+            'configuration',
+            'clean-and-update-working-directory',
+            'show-identifier',
+            'kill-old-processes',
+            'delete-WebKitBuild-directory',
+            'delete-stale-build-files',
+            'jhbuild',
+            'download-built-product',
+            'extract-built-product',
+            'webdriver-test'
</ins><span class="cx">         ],
</span><del>-        "GTK-Linux-64-bit-Debug-Build": [
-            "configure-build",
-            "configuration",
-            "clean-and-update-working-directory",
-            "show-identifier",
-            "kill-old-processes",
-            "delete-WebKitBuild-directory",
-            "delete-stale-build-files",
-            "jhbuild",
-            "compile-webkit",
-            "install-built-product",
-            "archive-built-product",
-            "upload",
-            "transfer-to-s3",
-            "trigger"
</del><ins>+        'GTK-Linux-64-bit-Debug-Build': [
+            'configure-build',
+            'configuration',
+            'clean-and-update-working-directory',
+            'show-identifier',
+            'kill-old-processes',
+            'delete-WebKitBuild-directory',
+            'delete-stale-build-files',
+            'jhbuild',
+            'compile-webkit',
+            'install-built-product',
+            'archive-built-product',
+            'upload',
+            'transfer-to-s3',
+            'trigger'
</ins><span class="cx">         ],
</span><del>-        "GTK-Linux-64-bit-Debug-Tests": [
-            "configure-build",
-            "configuration",
-            "clean-and-update-working-directory",
-            "show-identifier",
-            "kill-old-processes",
-            "delete-WebKitBuild-directory",
-            "delete-stale-build-files",
-            "jhbuild",
-            "download-built-product",
-            "extract-built-product",
-            "layout-test",
-            "dashboard-tests",
-            "archive-test-results",
-            "upload",
-            "extract-test-results",
-            "set-permissions",
-            "webkitpy-test",
-            "webkitperl-test",
-            "bindings-generation-tests",
-            "builtins-generator-tests",
-            "API-tests"
</del><ins>+        'GTK-Linux-64-bit-Debug-Tests': [
+            'configure-build',
+            'configuration',
+            'clean-and-update-working-directory',
+            'show-identifier',
+            'kill-old-processes',
+            'delete-WebKitBuild-directory',
+            'delete-stale-build-files',
+            'jhbuild',
+            'download-built-product',
+            'extract-built-product',
+            'layout-test',
+            'dashboard-tests',
+            'archive-test-results',
+            'upload',
+            'extract-test-results',
+            'set-permissions',
+            'webkitpy-test',
+            'webkitperl-test',
+            'bindings-generation-tests',
+            'builtins-generator-tests',
+            'API-tests'
</ins><span class="cx">         ],
</span><del>-        "GTK-Linux-64-bit-Debug-JS-Tests": [
-            "configure-build",
-            "configuration",
-            "clean-and-update-working-directory",
-            "show-identifier",
-            "kill-old-processes",
-            "delete-WebKitBuild-directory",
-            "delete-stale-build-files",
-            "jhbuild",
-            "download-built-product",
-            "extract-built-product",
-            "jscore-test",
-            "test262-test"
</del><ins>+        'GTK-Linux-64-bit-Debug-JS-Tests': [
+            'configure-build',
+            'configuration',
+            'clean-and-update-working-directory',
+            'show-identifier',
+            'kill-old-processes',
+            'delete-WebKitBuild-directory',
+            'delete-stale-build-files',
+            'jhbuild',
+            'download-built-product',
+            'extract-built-product',
+            'jscore-test',
+            'test262-test'
</ins><span class="cx">         ],
</span><del>-        "GTK-Linux-64-bit-Debug-WebDriver-Tests": [
-            "configure-build",
-            "configuration",
-            "clean-and-update-working-directory",
-            "show-identifier",
-            "kill-old-processes",
-            "delete-WebKitBuild-directory",
-            "delete-stale-build-files",
-            "jhbuild",
-            "download-built-product",
-            "extract-built-product",
-            "webdriver-test"
</del><ins>+        'GTK-Linux-64-bit-Debug-WebDriver-Tests': [
+            'configure-build',
+            'configuration',
+            'clean-and-update-working-directory',
+            'show-identifier',
+            'kill-old-processes',
+            'delete-WebKitBuild-directory',
+            'delete-stale-build-files',
+            'jhbuild',
+            'download-built-product',
+            'extract-built-product',
+            'webdriver-test'
</ins><span class="cx">         ],
</span><del>-        "GTK-Linux-64-bit-Release-Perf": [
-            "configure-build",
-            "configuration",
-            "clean-and-update-working-directory",
-            "show-identifier",
-            "kill-old-processes",
-            "delete-WebKitBuild-directory",
-            "delete-stale-build-files",
-            "jhbuild",
-            "download-built-product",
-            "extract-built-product",
-            "perf-test",
-            "benchmark-test"
</del><ins>+        'GTK-Linux-64-bit-Release-Perf': [
+            'configure-build',
+            'configuration',
+            'clean-and-update-working-directory',
+            'show-identifier',
+            'kill-old-processes',
+            'delete-WebKitBuild-directory',
+            'delete-stale-build-files',
+            'jhbuild',
+            'download-built-product',
+            'extract-built-product',
+            'perf-test',
+            'benchmark-test'
</ins><span class="cx">         ],
</span><del>-        "GTK-Linux-64-bit-Release-Wayland-Tests": [
-            "configure-build",
-            "configuration",
-            "clean-and-update-working-directory",
-            "show-identifier",
-            "kill-old-processes",
-            "delete-WebKitBuild-directory",
-            "delete-stale-build-files",
-            "jhbuild",
-            "download-built-product",
-            "extract-built-product",
-            "layout-test",
-            "dashboard-tests",
-            "archive-test-results",
-            "upload",
-            "extract-test-results",
-            "set-permissions",
-            "webkitpy-test",
-            "webkitperl-test",
-            "bindings-generation-tests",
-            "builtins-generator-tests",
-            "API-tests",
-            "webdriver-test"
</del><ins>+        'GTK-Linux-64-bit-Release-Wayland-Tests': [
+            'configure-build',
+            'configuration',
+            'clean-and-update-working-directory',
+            'show-identifier',
+            'kill-old-processes',
+            'delete-WebKitBuild-directory',
+            'delete-stale-build-files',
+            'jhbuild',
+            'download-built-product',
+            'extract-built-product',
+            'layout-test',
+            'dashboard-tests',
+            'archive-test-results',
+            'upload',
+            'extract-test-results',
+            'set-permissions',
+            'webkitpy-test',
+            'webkitperl-test',
+            'bindings-generation-tests',
+            'builtins-generator-tests',
+            'API-tests',
+            'webdriver-test'
</ins><span class="cx">         ],
</span><del>-        "GTK-Linux-64-bit-Release-Debian-Stable-Build": [
-            "configure-build",
-            "configuration",
-            "clean-and-update-working-directory",
-            "show-identifier",
-            "kill-old-processes",
-            "delete-WebKitBuild-directory",
-            "delete-stale-build-files",
-            "compile-webkit"
</del><ins>+        'GTK-Linux-64-bit-Release-Debian-Stable-Build': [
+            'configure-build',
+            'configuration',
+            'clean-and-update-working-directory',
+            'show-identifier',
+            'kill-old-processes',
+            'delete-WebKitBuild-directory',
+            'delete-stale-build-files',
+            'compile-webkit'
</ins><span class="cx">         ],
</span><del>-        "GTK-Linux-64-bit-Release-Ubuntu-LTS-Build": [
-            "configure-build",
-            "configuration",
-            "clean-and-update-working-directory",
-            "show-identifier",
-            "kill-old-processes",
-            "delete-WebKitBuild-directory",
-            "delete-stale-build-files",
-            "compile-webkit"
</del><ins>+        'GTK-Linux-64-bit-Release-Ubuntu-LTS-Build': [
+            'configure-build',
+            'configuration',
+            'clean-and-update-working-directory',
+            'show-identifier',
+            'kill-old-processes',
+            'delete-WebKitBuild-directory',
+            'delete-stale-build-files',
+            'compile-webkit'
</ins><span class="cx">         ],
</span><del>-        "GTK-Linux-64bit-Release-Packaging-Nightly-Ubuntu1804": [
-            "configure-build",
-            "configuration",
-            "clean-and-update-working-directory",
-            "show-identifier",
-            "kill-old-processes",
-            "delete-WebKitBuild-directory",
-            "delete-stale-build-files",
-            "jhbuild",
-            "compile-webkit",
-            "generate-minibrowser-bundle"
</del><ins>+        'GTK-Linux-64bit-Release-Packaging-Nightly-Ubuntu1804': [
+            'configure-build',
+            'configuration',
+            'clean-and-update-working-directory',
+            'show-identifier',
+            'kill-old-processes',
+            'delete-WebKitBuild-directory',
+            'delete-stale-build-files',
+            'jhbuild',
+            'compile-webkit',
+            'generate-minibrowser-bundle'
</ins><span class="cx">         ],
</span><del>-        "GTK-Linux-64bit-Release-Packaging-Nightly-Ubuntu2004": [
-            "configure-build",
-            "configuration",
-            "clean-and-update-working-directory",
-            "show-identifier",
-            "kill-old-processes",
-            "delete-WebKitBuild-directory",
-            "delete-stale-build-files",
-            "jhbuild",
-            "compile-webkit",
-            "generate-minibrowser-bundle"
</del><ins>+        'GTK-Linux-64bit-Release-Packaging-Nightly-Ubuntu2004': [
+            'configure-build',
+            'configuration',
+            'clean-and-update-working-directory',
+            'show-identifier',
+            'kill-old-processes',
+            'delete-WebKitBuild-directory',
+            'delete-stale-build-files',
+            'jhbuild',
+            'compile-webkit',
+            'generate-minibrowser-bundle'
</ins><span class="cx">         ],
</span><del>-        "GTK-Linux-64-bit-Release-GTK4-Tests": [
-            "configure-build",
-            "configuration",
-            "clean-and-update-working-directory",
-            "show-identifier",
-            "kill-old-processes",
-            "delete-WebKitBuild-directory",
-            "delete-stale-build-files",
-            "jhbuild",
-            "compile-webkit",
-            "layout-test",
-            "dashboard-tests",
-            "archive-test-results",
-            "upload",
-            "extract-test-results",
-            "set-permissions",
-            "webkitpy-test",
-            "webkitperl-test",
-            "bindings-generation-tests",
-            "builtins-generator-tests",
-            "API-tests",
-            "webdriver-test"
</del><ins>+        'GTK-Linux-64-bit-Release-GTK4-Tests': [
+            'configure-build',
+            'configuration',
+            'clean-and-update-working-directory',
+            'show-identifier',
+            'kill-old-processes',
+            'delete-WebKitBuild-directory',
+            'delete-stale-build-files',
+            'jhbuild',
+            'compile-webkit',
+            'layout-test',
+            'dashboard-tests',
+            'archive-test-results',
+            'upload',
+            'extract-test-results',
+            'set-permissions',
+            'webkitpy-test',
+            'webkitperl-test',
+            'bindings-generation-tests',
+            'builtins-generator-tests',
+            'API-tests',
+            'webdriver-test'
</ins><span class="cx">         ],
</span><del>-        "GTK-Linux-64-bit-Release-Skip-Failing-Tests": [
-            "configure-build",
-            "configuration",
-            "clean-and-update-working-directory",
-            "show-identifier",
-            "kill-old-processes",
-            "delete-WebKitBuild-directory",
-            "delete-stale-build-files",
-            "jhbuild",
-            "download-built-product",
-            "extract-built-product",
-            "layout-test",
-            "dashboard-tests",
-            "archive-test-results",
-            "upload",
-            "extract-test-results",
-            "set-permissions",
-            "webkitpy-test",
-            "webkitperl-test",
-            "bindings-generation-tests",
-            "builtins-generator-tests",
-            "API-tests"
</del><ins>+        'GTK-Linux-64-bit-Release-Skip-Failing-Tests': [
+            'configure-build',
+            'configuration',
+            'clean-and-update-working-directory',
+            'show-identifier',
+            'kill-old-processes',
+            'delete-WebKitBuild-directory',
+            'delete-stale-build-files',
+            'jhbuild',
+            'download-built-product',
+            'extract-built-product',
+            'layout-test',
+            'dashboard-tests',
+            'archive-test-results',
+            'upload',
+            'extract-test-results',
+            'set-permissions',
+            'webkitpy-test',
+            'webkitperl-test',
+            'bindings-generation-tests',
+            'builtins-generator-tests',
+            'API-tests'
</ins><span class="cx">         ],
</span><del>-        "WinCairo-64-bit-WKL-Release-Build": [
-            "configure-build",
-            "configuration",
-            "clean-and-update-working-directory",
-            "show-identifier",
-            "kill-old-processes",
-            "delete-WebKitBuild-directory",
-            "delete-stale-build-files",
-            "compile-webkit",
-            "archive-built-product",
-            "upload",
-            "transfer-to-s3",
-            "trigger"
</del><ins>+        'WinCairo-64-bit-WKL-Release-Build': [
+            'configure-build',
+            'configuration',
+            'clean-and-update-working-directory',
+            'show-identifier',
+            'kill-old-processes',
+            'delete-WebKitBuild-directory',
+            'delete-stale-build-files',
+            'compile-webkit',
+            'archive-built-product',
+            'upload',
+            'transfer-to-s3',
+            'trigger'
</ins><span class="cx">         ],
</span><del>-        "WinCairo-64-bit-WKL-Release-Tests": [
-            "configure-build",
-            "configuration",
-            "clean-and-update-working-directory",
-            "show-identifier",
-            "kill-old-processes",
-            "delete-WebKitBuild-directory",
-            "delete-stale-build-files",
-            "download-built-product",
-            "extract-built-product",
-            "wincairo-requirements",
-            "layout-test",
-            "archive-test-results",
-            "upload",
-            "extract-test-results",
-            "set-permissions",
-            "run-api-tests",
-            "webkitpy-test",
-            "webkitperl-test",
-            "bindings-generation-tests",
-            "builtins-generator-tests"
</del><ins>+        'WinCairo-64-bit-WKL-Release-Tests': [
+            'configure-build',
+            'configuration',
+            'clean-and-update-working-directory',
+            'show-identifier',
+            'kill-old-processes',
+            'delete-WebKitBuild-directory',
+            'delete-stale-build-files',
+            'download-built-product',
+            'extract-built-product',
+            'wincairo-requirements',
+            'layout-test',
+            'archive-test-results',
+            'upload',
+            'extract-test-results',
+            'set-permissions',
+            'run-api-tests',
+            'webkitpy-test',
+            'webkitperl-test',
+            'bindings-generation-tests',
+            'builtins-generator-tests'
</ins><span class="cx">         ],
</span><del>-        "WinCairo-64-bit-JSC-Release-Tests": [
-            "configure-build",
-            "configuration",
-            "clean-and-update-working-directory",
-            "show-identifier",
-            "kill-old-processes",
-            "delete-WebKitBuild-directory",
-            "delete-stale-build-files",
-            "download-built-product",
-            "extract-built-product",
-            "jscore-test"
</del><ins>+        'WinCairo-64-bit-JSC-Release-Tests': [
+            'configure-build',
+            'configuration',
+            'clean-and-update-working-directory',
+            'show-identifier',
+            'kill-old-processes',
+            'delete-WebKitBuild-directory',
+            'delete-stale-build-files',
+            'download-built-product',
+            'extract-built-product',
+            'jscore-test'
</ins><span class="cx">         ],
</span><del>-        "WinCairo-64-bit-WKL-Debug-Build": [
-            "configure-build",
-            "configuration",
-            "clean-and-update-working-directory",
-            "show-identifier",
-            "kill-old-processes",
-            "delete-WebKitBuild-directory",
-            "delete-stale-build-files",
-            "compile-webkit",
-            "archive-built-product",
-            "upload",
-            "transfer-to-s3",
-            "trigger"
</del><ins>+        'WinCairo-64-bit-WKL-Debug-Build': [
+            'configure-build',
+            'configuration',
+            'clean-and-update-working-directory',
+            'show-identifier',
+            'kill-old-processes',
+            'delete-WebKitBuild-directory',
+            'delete-stale-build-files',
+            'compile-webkit',
+            'archive-built-product',
+            'upload',
+            'transfer-to-s3',
+            'trigger'
</ins><span class="cx">         ],
</span><del>-        "WinCairo-64-bit-WKL-Debug-Tests": [
-            "configure-build",
-            "configuration",
-            "clean-and-update-working-directory",
-            "show-identifier",
-            "kill-old-processes",
-            "delete-WebKitBuild-directory",
-            "delete-stale-build-files",
-            "download-built-product",
-            "extract-built-product",
-            "wincairo-requirements",
-            "layout-test",
-            "archive-test-results",
-            "upload",
-            "extract-test-results",
-            "set-permissions",
-            "run-api-tests",
-            "webkitpy-test",
-            "webkitperl-test",
-            "bindings-generation-tests",
-            "builtins-generator-tests"
</del><ins>+        'WinCairo-64-bit-WKL-Debug-Tests': [
+            'configure-build',
+            'configuration',
+            'clean-and-update-working-directory',
+            'show-identifier',
+            'kill-old-processes',
+            'delete-WebKitBuild-directory',
+            'delete-stale-build-files',
+            'download-built-product',
+            'extract-built-product',
+            'wincairo-requirements',
+            'layout-test',
+            'archive-test-results',
+            'upload',
+            'extract-test-results',
+            'set-permissions',
+            'run-api-tests',
+            'webkitpy-test',
+            'webkitperl-test',
+            'bindings-generation-tests',
+            'builtins-generator-tests'
</ins><span class="cx">         ],
</span><del>-        "WinCairo-64-bit-JSC-Debug-Tests": [
-            "configure-build",
-            "configuration",
-            "clean-and-update-working-directory",
-            "show-identifier",
-            "kill-old-processes",
-            "delete-WebKitBuild-directory",
-            "delete-stale-build-files",
-            "download-built-product",
-            "extract-built-product",
-            "jscore-test"
</del><ins>+        'WinCairo-64-bit-JSC-Debug-Tests': [
+            'configure-build',
+            'configuration',
+            'clean-and-update-working-directory',
+            'show-identifier',
+            'kill-old-processes',
+            'delete-WebKitBuild-directory',
+            'delete-stale-build-files',
+            'download-built-product',
+            'extract-built-product',
+            'jscore-test'
</ins><span class="cx">         ],
</span><del>-        "PlayStation-Debug-Build": [
-            "configure-build",
-            "configuration",
-            "clean-and-update-working-directory",
-            "show-identifier",
-            "kill-old-processes",
-            "delete-WebKitBuild-directory",
-            "delete-stale-build-files",
-            "compile-webkit"
</del><ins>+        'PlayStation-Debug-Build': [
+            'configure-build',
+            'configuration',
+            'clean-and-update-working-directory',
+            'show-identifier',
+            'kill-old-processes',
+            'delete-WebKitBuild-directory',
+            'delete-stale-build-files',
+            'compile-webkit'
</ins><span class="cx">         ],
</span><del>-        "PlayStation-Release-Build": [
-            "configure-build",
-            "configuration",
-            "clean-and-update-working-directory",
-            "show-identifier",
-            "kill-old-processes",
-            "delete-WebKitBuild-directory",
-            "delete-stale-build-files",
-            "compile-webkit"
</del><ins>+        'PlayStation-Release-Build': [
+            'configure-build',
+            'configuration',
+            'clean-and-update-working-directory',
+            'show-identifier',
+            'kill-old-processes',
+            'delete-WebKitBuild-directory',
+            'delete-stale-build-files',
+            'compile-webkit'
</ins><span class="cx">         ],
</span><del>-        "JSCOnly-Linux-AArch64-Release": [
-            "configure-build",
-            "configuration",
-            "clean-and-update-working-directory",
-            "show-identifier",
-            "delete-WebKitBuild-directory",
-            "delete-stale-build-files",
-            "compile-webkit",
-            "jscore-test"
</del><ins>+        'JSCOnly-Linux-AArch64-Release': [
+            'configure-build',
+            'configuration',
+            'clean-and-update-working-directory',
+            'show-identifier',
+            'delete-WebKitBuild-directory',
+            'delete-stale-build-files',
+            'compile-webkit',
+            'jscore-test'
</ins><span class="cx">         ],
</span><del>-        "JSCOnly-Linux-ARMv7-Thumb2-Release": [
-            "configure-build",
-            "configuration",
-            "clean-and-update-working-directory",
-            "show-identifier",
-            "delete-WebKitBuild-directory",
-            "delete-stale-build-files",
-            "compile-webkit",
-            "jscore-test"
</del><ins>+        'JSCOnly-Linux-ARMv7-Thumb2-Release': [
+            'configure-build',
+            'configuration',
+            'clean-and-update-working-directory',
+            'show-identifier',
+            'delete-WebKitBuild-directory',
+            'delete-stale-build-files',
+            'compile-webkit',
+            'jscore-test'
</ins><span class="cx">         ],
</span><del>-        "JSCOnly-Linux-ARMv7-Thumb2-SoftFP-Release": [
-            "configure-build",
-            "configuration",
-            "clean-and-update-working-directory",
-            "show-identifier",
-            "delete-WebKitBuild-directory",
-            "delete-stale-build-files",
-            "compile-webkit",
-            "jscore-test"
</del><ins>+        'JSCOnly-Linux-ARMv7-Thumb2-SoftFP-Release': [
+            'configure-build',
+            'configuration',
+            'clean-and-update-working-directory',
+            'show-identifier',
+            'delete-WebKitBuild-directory',
+            'delete-stale-build-files',
+            'compile-webkit',
+            'jscore-test'
</ins><span class="cx">         ],
</span><del>-        "JSCOnly-Linux-MIPS32el-Release": [
-            "configure-build",
-            "configuration",
-            "clean-and-update-working-directory",
-            "show-identifier",
-            "delete-WebKitBuild-directory",
-            "delete-stale-build-files",
-            "compile-webkit",
-            "jscore-test"
</del><ins>+        'JSCOnly-Linux-MIPS32el-Release': [
+            'configure-build',
+            'configuration',
+            'clean-and-update-working-directory',
+            'show-identifier',
+            'delete-WebKitBuild-directory',
+            'delete-stale-build-files',
+            'compile-webkit',
+            'jscore-test'
</ins><span class="cx">         ],
</span><del>-        "WPE-Linux-64-bit-Release-Build": [
-            "configure-build",
-            "configuration",
-            "clean-and-update-working-directory",
-            "show-identifier",
-            "kill-old-processes",
-            "delete-WebKitBuild-directory",
-            "delete-stale-build-files",
-            "jhbuild",
-            "compile-webkit",
-            "archive-built-product",
-            "upload",
-            "transfer-to-s3",
-            "trigger"
</del><ins>+        'WPE-Linux-64-bit-Release-Build': [
+            'configure-build',
+            'configuration',
+            'clean-and-update-working-directory',
+            'show-identifier',
+            'kill-old-processes',
+            'delete-WebKitBuild-directory',
+            'delete-stale-build-files',
+            'jhbuild',
+            'compile-webkit',
+            'archive-built-product',
+            'upload',
+            'transfer-to-s3',
+            'trigger'
</ins><span class="cx">         ],
</span><del>-        "WPE-Linux-64-bit-Release-Tests": [
-            "configure-build",
-            "configuration",
-            "clean-and-update-working-directory",
-            "show-identifier",
-            "kill-old-processes",
-            "delete-WebKitBuild-directory",
-            "delete-stale-build-files",
-            "jhbuild",
-            "download-built-product",
-            "extract-built-product",
-            "layout-test",
-            "dashboard-tests",
-            "archive-test-results",
-            "upload",
-            "extract-test-results",
-            "set-permissions",
-            "webkitpy-test",
-            "webkitperl-test",
-            "bindings-generation-tests",
-            "builtins-generator-tests",
-            "API-tests",
-            "webdriver-test"
</del><ins>+        'WPE-Linux-64-bit-Release-Tests': [
+            'configure-build',
+            'configuration',
+            'clean-and-update-working-directory',
+            'show-identifier',
+            'kill-old-processes',
+            'delete-WebKitBuild-directory',
+            'delete-stale-build-files',
+            'jhbuild',
+            'download-built-product',
+            'extract-built-product',
+            'layout-test',
+            'dashboard-tests',
+            'archive-test-results',
+            'upload',
+            'extract-test-results',
+            'set-permissions',
+            'webkitpy-test',
+            'webkitperl-test',
+            'bindings-generation-tests',
+            'builtins-generator-tests',
+            'API-tests',
+            'webdriver-test'
</ins><span class="cx">         ],
</span><del>-        "WPE-Linux-64-bit-Release-JS-Tests": [
-            "configure-build",
-            "configuration",
-            "clean-and-update-working-directory",
-            "show-identifier",
-            "kill-old-processes",
-            "delete-WebKitBuild-directory",
-            "delete-stale-build-files",
-            "jhbuild",
-            "download-built-product",
-            "extract-built-product",
-            "jscore-test",
-            "test262-test"
</del><ins>+        'WPE-Linux-64-bit-Release-JS-Tests': [
+            'configure-build',
+            'configuration',
+            'clean-and-update-working-directory',
+            'show-identifier',
+            'kill-old-processes',
+            'delete-WebKitBuild-directory',
+            'delete-stale-build-files',
+            'jhbuild',
+            'download-built-product',
+            'extract-built-product',
+            'jscore-test',
+            'test262-test'
</ins><span class="cx">         ],
</span><del>-        "WPE-Linux-64-bit-Debug-Build": [
-            "configure-build",
-            "configuration",
-            "clean-and-update-working-directory",
-            "show-identifier",
-            "kill-old-processes",
-            "delete-WebKitBuild-directory",
-            "delete-stale-build-files",
-            "jhbuild",
-            "compile-webkit",
-            "archive-built-product",
-            "upload",
-            "transfer-to-s3",
-            "trigger"
</del><ins>+        'WPE-Linux-64-bit-Debug-Build': [
+            'configure-build',
+            'configuration',
+            'clean-and-update-working-directory',
+            'show-identifier',
+            'kill-old-processes',
+            'delete-WebKitBuild-directory',
+            'delete-stale-build-files',
+            'jhbuild',
+            'compile-webkit',
+            'archive-built-product',
+            'upload',
+            'transfer-to-s3',
+            'trigger'
</ins><span class="cx">         ],
</span><del>-        "WPE-Linux-64-bit-Debug-Tests": [
-            "configure-build",
-            "configuration",
-            "clean-and-update-working-directory",
-            "show-identifier",
-            "kill-old-processes",
-            "delete-WebKitBuild-directory",
-            "delete-stale-build-files",
-            "jhbuild",
-            "download-built-product",
-            "extract-built-product",
-            "layout-test",
-            "dashboard-tests",
-            "archive-test-results",
-            "upload",
-            "extract-test-results",
-            "set-permissions",
-            "webkitpy-test",
-            "webkitperl-test",
-            "bindings-generation-tests",
-            "builtins-generator-tests",
-            "API-tests",
-            "webdriver-test"
</del><ins>+        'WPE-Linux-64-bit-Debug-Tests': [
+            'configure-build',
+            'configuration',
+            'clean-and-update-working-directory',
+            'show-identifier',
+            'kill-old-processes',
+            'delete-WebKitBuild-directory',
+            'delete-stale-build-files',
+            'jhbuild',
+            'download-built-product',
+            'extract-built-product',
+            'layout-test',
+            'dashboard-tests',
+            'archive-test-results',
+            'upload',
+            'extract-test-results',
+            'set-permissions',
+            'webkitpy-test',
+            'webkitperl-test',
+            'bindings-generation-tests',
+            'builtins-generator-tests',
+            'API-tests',
+            'webdriver-test'
</ins><span class="cx">         ],
</span><del>-        "WPE-Linux-64-bit-Debug-JS-Tests": [
-            "configure-build",
-            "configuration",
-            "clean-and-update-working-directory",
-            "show-identifier",
-            "kill-old-processes",
-            "delete-WebKitBuild-directory",
-            "delete-stale-build-files",
-            "jhbuild",
-            "download-built-product",
-            "extract-built-product",
-            "jscore-test",
-            "test262-test"
</del><ins>+        'WPE-Linux-64-bit-Debug-JS-Tests': [
+            'configure-build',
+            'configuration',
+            'clean-and-update-working-directory',
+            'show-identifier',
+            'kill-old-processes',
+            'delete-WebKitBuild-directory',
+            'delete-stale-build-files',
+            'jhbuild',
+            'download-built-product',
+            'extract-built-product',
+            'jscore-test',
+            'test262-test'
</ins><span class="cx">         ],
</span><del>-        "WPE-Linux-64bit-Release-Packaging-Nightly-Ubuntu1804": [
-            "configure-build",
-            "configuration",
-            "clean-and-update-working-directory",
-            "show-identifier",
-            "kill-old-processes",
-            "delete-WebKitBuild-directory",
-            "delete-stale-build-files",
-            "jhbuild",
-            "compile-webkit",
-            "generate-minibrowser-bundle"
</del><ins>+        'WPE-Linux-64bit-Release-Packaging-Nightly-Ubuntu1804': [
+            'configure-build',
+            'configuration',
+            'clean-and-update-working-directory',
+            'show-identifier',
+            'kill-old-processes',
+            'delete-WebKitBuild-directory',
+            'delete-stale-build-files',
+            'jhbuild',
+            'compile-webkit',
+            'generate-minibrowser-bundle'
</ins><span class="cx">         ],
</span><del>-        "WPE-Linux-64bit-Release-Packaging-Nightly-Ubuntu2004": [
-            "configure-build",
-            "configuration",
-            "clean-and-update-working-directory",
-            "show-identifier",
-            "kill-old-processes",
-            "delete-WebKitBuild-directory",
-            "delete-stale-build-files",
-            "jhbuild",
-            "compile-webkit",
-            "generate-minibrowser-bundle"
</del><ins>+        'WPE-Linux-64bit-Release-Packaging-Nightly-Ubuntu2004': [
+            'configure-build',
+            'configuration',
+            'clean-and-update-working-directory',
+            'show-identifier',
+            'kill-old-processes',
+            'delete-WebKitBuild-directory',
+            'delete-stale-build-files',
+            'jhbuild',
+            'compile-webkit',
+            'generate-minibrowser-bundle'
</ins><span class="cx">         ],
</span><del>-        "WPE-Linux-64-bit-Release-Non-Unified-Build": [
-            "configure-build",
-            "configuration",
-            "clean-and-update-working-directory",
-            "show-identifier",
-            "kill-old-processes",
-            "delete-WebKitBuild-directory",
-            "delete-stale-build-files",
-            "jhbuild",
-            "compile-webkit"
</del><ins>+        'WPE-Linux-64-bit-Release-Non-Unified-Build': [
+            'configure-build',
+            'configuration',
+            'clean-and-update-working-directory',
+            'show-identifier',
+            'kill-old-processes',
+            'delete-WebKitBuild-directory',
+            'delete-stale-build-files',
+            'jhbuild',
+            'compile-webkit'
</ins><span class="cx">         ],
</span><del>-        "WPE-Linux-64-bit-Release-Ubuntu-LTS-Build": [
-            "configure-build",
-            "configuration",
-            "clean-and-update-working-directory",
-            "show-identifier",
-            "kill-old-processes",
-            "delete-WebKitBuild-directory",
-            "delete-stale-build-files",
-            "jhbuild",
-            "compile-webkit"
</del><ins>+        'WPE-Linux-64-bit-Release-Ubuntu-LTS-Build': [
+            'configure-build',
+            'configuration',
+            'clean-and-update-working-directory',
+            'show-identifier',
+            'kill-old-processes',
+            'delete-WebKitBuild-directory',
+            'delete-stale-build-files',
+            'jhbuild',
+            'compile-webkit'
</ins><span class="cx">         ]
</span><span class="cx">     }
</span><span class="cx"> 
</span><span class="lines">@@ -1376,17 +1374,17 @@
</span><span class="cx">         self.config = {}
</span><span class="cx">         loadConfig.loadBuilderConfig(self.config, is_test_mode_enabled=True, master_prefix_path=cwd)
</span><span class="cx"> 
</span><del>-    def test_all_expected_results(self):
</del><ins>+    def test_all_expected_steps(self):
</ins><span class="cx">         for builder in self.config['builders']:
</span><span class="cx">             buildSteps = []
</span><span class="cx">             for step in builder['factory'].steps:
</span><span class="cx">                 buildSteps.append(step.factory.name)
</span><del>-            self.assertTrue(builder['name'] in self.expected_steps, "Missing expected results for builder: %s\n Actual result is %s" % (builder['name'], buildSteps))
-            self.assertListEqual(self.expected_steps[builder['name']], buildSteps, msg="Expected results don't match for builder %s" % builder['name'])
</del><ins>+            self.assertTrue(builder['name'] in self.expected_steps, 'Missing expected steps for builder: %s\n Actual result is %s' % (builder['name'], buildSteps))
+            self.assertListEqual(self.expected_steps[builder['name']], buildSteps, msg="Expected steps don't match for builder %s" % builder['name'])
</ins><span class="cx"> 
</span><del>-    def test_unnecessary_expected_results(self):
</del><ins>+    def test_unnecessary_expected_steps(self):
</ins><span class="cx">         builders = set()
</span><span class="cx">         for builder in self.config['builders']:
</span><span class="cx">             builders.add(builder['name'])
</span><span class="cx">         for builder in self.expected_steps:
</span><del>-            self.assertTrue(builder in builders, "Builder %s doesn't exist, but has unnecessary expected results" % builder)
</del><ins>+            self.assertTrue(builder in builders, "Builder %s doesn't exist, but has unnecessary expected steps" % builder)
</ins></span></pre></div>
<a id="trunkToolsCISupportewsbuildfactories_unittestpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/CISupport/ews-build/factories_unittest.py (281321 => 281322)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/CISupport/ews-build/factories_unittest.py    2021-08-20 17:01:00 UTC (rev 281321)
+++ trunk/Tools/CISupport/ews-build/factories_unittest.py       2021-08-20 17:12:40 UTC (rev 281322)
</span><span class="lines">@@ -1,4 +1,5 @@
</span><span class="cx"> # Copyright (C) 2020-2021 Apple Inc. All rights reserved.
</span><ins>+# Copyright (C) 2021 Igalia S.L.
</ins><span class="cx"> #
</span><span class="cx"> # Redistribution and use in source and binary forms, with or without
</span><span class="cx"> # modification, are permitted provided that the following conditions
</span><span class="lines">@@ -20,675 +21,559 @@
</span><span class="cx"> # OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
</span><span class="cx"> # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> 
</span><ins>+import loadConfig
+import os
</ins><span class="cx"> import unittest
</span><span class="cx"> 
</span><del>-from buildbot.process.buildstep import _BuildStepFactory
-from buildbot.steps.master import SetProperty
</del><span class="cx"> 
</span><del>-import factories
-import steps
</del><ins>+class TestExpectedBuildSteps(unittest.TestCase):
</ins><span class="cx"> 
</span><ins>+    expected_steps = {
+        'Style-EWS': [
+            'configure-build',
+            'validate-patch',
+            'configuration',
+            'clean-and-update-working-directory',
+            'fetch-branch-references',
+            'show-identifier',
+            'update-working-directory',
+            'apply-patch',
+            'check-webkit-style'
+        ],
+        'Apply-WatchList-EWS': [
+            'configure-build',
+            'validate-patch',
+            'configuration',
+            'clean-and-update-working-directory',
+            'fetch-branch-references',
+            'show-identifier',
+            'update-working-directory',
+            'apply-patch',
+            'apply-watch-list'
+        ],
+        'GTK-Build-EWS': [
+            'configure-build',
+            'validate-patch',
+            'configuration',
+            'clean-and-update-working-directory',
+            'checkout-specific-revision',
+            'fetch-branch-references',
+            'show-identifier',
+            'apply-patch',
+            'kill-old-processes',
+            'jhbuild',
+            'compile-webkit',
+            'install-built-product'
+        ],
+        'GTK-WK2-Tests-EWS': [
+            'configure-build',
+            'validate-patch',
+            'configuration',
+            'clean-and-update-working-directory',
+            'checkout-specific-revision',
+            'fetch-branch-references',
+            'show-identifier',
+            'apply-patch',
+            'jhbuild',
+            'download-built-product',
+            'extract-built-product',
+            'kill-old-processes',
+            'find-modified-layout-tests',
+            'run-layout-tests-in-stress-mode',
+            'layout-tests',
+            'set-build-summary'
+        ],
+        'iOS-14-Build-EWS': [
+            'configure-build',
+            'validate-patch',
+            'configuration',
+            'clean-and-update-working-directory',
+            'checkout-specific-revision',
+            'fetch-branch-references',
+            'show-identifier',
+            'apply-patch',
+            'kill-old-processes',
+            'compile-webkit'
+        ],
+        'iOS-14-Simulator-Build-EWS': [
+            'configure-build',
+            'validate-patch',
+            'configuration',
+            'clean-and-update-working-directory',
+            'checkout-specific-revision',
+            'fetch-branch-references',
+            'show-identifier',
+            'apply-patch',
+            'kill-old-processes',
+            'compile-webkit'
+        ],
+        'iOS-14-Simulator-WK2-Tests-EWS': [
+            'configure-build',
+            'validate-patch',
+            'configuration',
+            'clean-and-update-working-directory',
+            'checkout-specific-revision',
+            'fetch-branch-references',
+            'show-identifier',
+            'apply-patch',
+            'download-built-product',
+            'extract-built-product',
+            'wait-for-crash-collection',
+            'kill-old-processes',
+            'find-modified-layout-tests',
+            'run-layout-tests-in-stress-mode',
+            'layout-tests',
+            'trigger-crash-log-submission',
+            'set-build-summary'
+        ],
+        'macOS-AppleSilicon-Big-Sur-Debug-Build-EWS': [
+            'configure-build',
+            'check-patch-relevance',
+            'validate-patch',
+            'configuration',
+            'clean-and-update-working-directory',
+            'checkout-specific-revision',
+            'fetch-branch-references',
+            'show-identifier',
+            'apply-patch',
+            'kill-old-processes',
+            'compile-webkit'
+        ],
+        'macOS-AppleSilicon-Big-Sur-Debug-WK2-Tests-EWS': [
+            'configure-build',
+            'validate-patch',
+            'configuration',
+            'clean-and-update-working-directory',
+            'checkout-specific-revision',
+            'fetch-branch-references',
+            'show-identifier',
+            'apply-patch',
+            'download-built-product',
+            'extract-built-product',
+            'wait-for-crash-collection',
+            'kill-old-processes',
+            'find-modified-layout-tests',
+            'run-layout-tests-in-stress-mode',
+            'layout-tests',
+            'trigger-crash-log-submission',
+            'set-build-summary'
+        ],
+        'macOS-Catalina-Release-Build-EWS': [
+            'configure-build',
+            'validate-patch',
+            'configuration',
+            'clean-and-update-working-directory',
+            'checkout-specific-revision',
+            'fetch-branch-references',
+            'show-identifier',
+            'apply-patch',
+            'kill-old-processes',
+            'compile-webkit'
+        ],
+        'macOS-Catalina-Release-WK1-Tests-EWS': [
+            'configure-build',
+            'check-patch-relevance',
+            'validate-patch',
+            'configuration',
+            'clean-and-update-working-directory',
+            'checkout-specific-revision',
+            'fetch-branch-references',
+            'show-identifier',
+            'apply-patch',
+            'download-built-product',
+            'extract-built-product',
+            'wait-for-crash-collection',
+            'kill-old-processes',
+            'find-modified-layout-tests',
+            'run-layout-tests-in-stress-mode',
+            'layout-tests',
+            'trigger-crash-log-submission',
+            'set-build-summary'
+        ],
+        'macOS-Catalina-Release-WK2-Tests-EWS': [
+            'configure-build',
+            'validate-patch',
+            'configuration',
+            'clean-and-update-working-directory',
+            'checkout-specific-revision',
+            'fetch-branch-references',
+            'show-identifier',
+            'apply-patch',
+            'download-built-product',
+            'extract-built-product',
+            'wait-for-crash-collection',
+            'kill-old-processes',
+            'find-modified-layout-tests',
+            'run-layout-tests-in-stress-mode',
+            'layout-tests',
+            'trigger-crash-log-submission',
+            'set-build-summary'
+        ],
+        'macOS-Release-WK2-Stress-Tests-EWS': [
+            'configure-build',
+            'find-modified-layout-tests',
+            'validate-patch',
+            'configuration',
+            'clean-and-update-working-directory',
+            'checkout-specific-revision',
+            'fetch-branch-references',
+            'show-identifier',
+            'apply-patch',
+            'download-built-product',
+            'extract-built-product',
+            'wait-for-crash-collection',
+            'kill-old-processes',
+            'run-layout-tests-in-stress-mode',
+            'trigger-crash-log-submission',
+            'set-build-summary'
+        ],
+        'macOS-Catalina-Debug-Build-EWS': [
+            'configure-build',
+            'validate-patch',
+            'configuration',
+            'clean-and-update-working-directory',
+            'checkout-specific-revision',
+            'fetch-branch-references',
+            'show-identifier',
+            'apply-patch',
+            'kill-old-processes',
+            'compile-webkit'
+        ],
+        'macOS-Catalina-Debug-WK1-Tests-EWS': [
+            'configure-build',
+            'check-patch-relevance',
+            'validate-patch',
+            'configuration',
+            'clean-and-update-working-directory',
+            'checkout-specific-revision',
+            'fetch-branch-references',
+            'show-identifier',
+            'apply-patch',
+            'download-built-product',
+            'extract-built-product',
+            'wait-for-crash-collection',
+            'kill-old-processes',
+            'find-modified-layout-tests',
+            'run-layout-tests-in-stress-mode',
+            'layout-tests',
+            'trigger-crash-log-submission',
+            'set-build-summary'
+        ],
+        'watchOS-7-Build-EWS': [
+            'configure-build',
+            'validate-patch',
+            'configuration',
+            'clean-and-update-working-directory',
+            'checkout-specific-revision',
+            'fetch-branch-references',
+            'show-identifier',
+            'apply-patch',
+            'kill-old-processes',
+            'compile-webkit'
+        ],
+        'watchOS-7-Simulator-Build-EWS': [
+            'configure-build',
+            'validate-patch',
+            'configuration',
+            'clean-and-update-working-directory',
+            'checkout-specific-revision',
+            'fetch-branch-references',
+            'show-identifier',
+            'apply-patch',
+            'kill-old-processes',
+            'compile-webkit'
+        ],
+        'tvOS-14-Build-EWS': [
+            'configure-build',
+            'validate-patch',
+            'configuration',
+            'clean-and-update-working-directory',
+            'checkout-specific-revision',
+            'fetch-branch-references',
+            'show-identifier',
+            'apply-patch',
+            'kill-old-processes',
+            'compile-webkit'
+        ],
+        'tvOS-14-Simulator-Build-EWS': [
+            'configure-build',
+            'validate-patch',
+            'configuration',
+            'clean-and-update-working-directory',
+            'checkout-specific-revision',
+            'fetch-branch-references',
+            'show-identifier',
+            'apply-patch',
+            'kill-old-processes',
+            'compile-webkit'
+        ],
+        'Windows-EWS': [
+            'configure-build',
+            'check-patch-relevance',
+            'validate-patch',
+            'configuration',
+            'clean-and-update-working-directory',
+            'checkout-specific-revision',
+            'fetch-branch-references',
+            'show-identifier',
+            'apply-patch',
+            'kill-old-processes',
+            'compile-webkit',
+            'validate-patch',
+            'layout-tests',
+            'set-build-summary'
+        ],
+        'WinCairo-EWS': [
+            'configure-build',
+            'validate-patch',
+            'configuration',
+            'clean-and-update-working-directory',
+            'checkout-specific-revision',
+            'fetch-branch-references',
+            'show-identifier',
+            'apply-patch',
+            'kill-old-processes',
+            'compile-webkit'
+        ],
+        'WPE-EWS': [
+            'configure-build',
+            'validate-patch',
+            'configuration',
+            'clean-and-update-working-directory',
+            'checkout-specific-revision',
+            'fetch-branch-references',
+            'show-identifier',
+            'apply-patch',
+            'kill-old-processes',
+            'jhbuild',
+            'compile-webkit'
+        ],
+        'JSC-Tests-EWS': [
+            'configure-build',
+            'check-patch-relevance',
+            'validate-patch',
+            'configuration',
+            'clean-and-update-working-directory',
+            'checkout-specific-revision',
+            'fetch-branch-references',
+            'show-identifier',
+            'apply-patch',
+            'kill-old-processes',
+            'compile-jsc',
+            'jscore-test'
+        ],
+        'JSC-MIPSEL-32bits-Build-EWS': [
+            'configure-build',
+            'check-patch-relevance',
+            'validate-patch',
+            'configuration',
+            'clean-and-update-working-directory',
+            'checkout-specific-revision',
+            'fetch-branch-references',
+            'show-identifier',
+            'apply-patch',
+            'kill-old-processes',
+            'compile-jsc'
+        ],
+        'JSC-MIPSEL-32bits-Tests-EWS': [
+            'configure-build',
+            'check-patch-relevance',
+            'validate-patch',
+            'configuration',
+            'clean-and-update-working-directory',
+            'checkout-specific-revision',
+            'fetch-branch-references',
+            'show-identifier',
+            'apply-patch',
+            'download-built-product',
+            'extract-built-product',
+            'kill-old-processes',
+            'jscore-test'
+        ],
+        'JSC-ARMv7-32bits-Build-EWS': [
+            'configure-build',
+            'check-patch-relevance',
+            'validate-patch',
+            'configuration',
+            'clean-and-update-working-directory',
+            'checkout-specific-revision',
+            'fetch-branch-references',
+            'show-identifier',
+            'apply-patch',
+            'kill-old-processes',
+            'compile-jsc'
+        ],
+        'JSC-ARMv7-32bits-Tests-EWS': [
+            'configure-build',
+            'check-patch-relevance',
+            'validate-patch',
+            'configuration',
+            'clean-and-update-working-directory',
+            'checkout-specific-revision',
+            'fetch-branch-references',
+            'show-identifier',
+            'apply-patch',
+            'download-built-product',
+            'extract-built-product',
+            'kill-old-processes',
+            'jscore-test'
+        ],
+        'JSC-i386-32bits-EWS': [
+            'configure-build',
+            'check-patch-relevance',
+            'validate-patch',
+            'configuration',
+            'clean-and-update-working-directory',
+            'checkout-specific-revision',
+            'fetch-branch-references',
+            'show-identifier',
+            'apply-patch',
+            'kill-old-processes',
+            'compile-jsc'
+        ],
+        'Bindings-Tests-EWS': [
+            'configure-build',
+            'check-patch-relevance',
+            'validate-patch',
+            'configuration',
+            'clean-and-update-working-directory',
+            'checkout-specific-revision',
+            'fetch-branch-references',
+            'show-identifier',
+            'apply-patch',
+            'bindings-tests'
+        ],
+        'WebKitPy-Tests-EWS': [
+            'configure-build',
+            'check-patch-relevance',
+            'validate-patch',
+            'configuration',
+            'clean-and-update-working-directory',
+            'checkout-specific-revision',
+            'fetch-branch-references',
+            'show-identifier',
+            'apply-patch',
+            'webkitpy-tests-python2',
+            'webkitpy-tests-python3',
+            'set-build-summary'
+        ],
+        'WebKitPerl-Tests-EWS': [
+            'configure-build',
+            'validate-patch',
+            'configuration',
+            'clean-and-update-working-directory',
+            'checkout-specific-revision',
+            'fetch-branch-references',
+            'show-identifier',
+            'apply-patch',
+            'webkitperl-tests'
+        ],
+        'API-Tests-iOS-Simulator-EWS': [
+            'configure-build',
+            'validate-patch',
+            'configuration',
+            'clean-and-update-working-directory',
+            'checkout-specific-revision',
+            'fetch-branch-references',
+            'show-identifier',
+            'apply-patch',
+            'download-built-product',
+            'extract-built-product',
+            'kill-old-processes',
+            'run-api-tests'
+        ],
+        'API-Tests-macOS-EWS': [
+            'configure-build',
+            'validate-patch',
+            'configuration',
+            'clean-and-update-working-directory',
+            'checkout-specific-revision',
+            'fetch-branch-references',
+            'show-identifier',
+            'apply-patch',
+            'download-built-product',
+            'extract-built-product',
+            'kill-old-processes',
+            'run-api-tests'
+        ],
+        'API-Tests-GTK-EWS': [
+            'configure-build',
+            'validate-patch',
+            'configuration',
+            'clean-and-update-working-directory',
+            'checkout-specific-revision',
+            'fetch-branch-references',
+            'show-identifier',
+            'apply-patch',
+            'jhbuild',
+            'download-built-product',
+            'extract-built-product',
+            'kill-old-processes',
+            'run-api-tests'
+        ],
+        'Services-EWS': [
+            'configure-build',
+            'check-patch-relevance',
+            'validate-patch',
+            'configuration',
+            'clean-and-update-working-directory',
+            'checkout-specific-revision',
+            'fetch-branch-references',
+            'show-identifier',
+            'apply-patch',
+            'build-webkit-org-unit-tests',
+            'buildbot-check-config-for-build-webkit',
+            'ews-unit-tests',
+            'buildbot-check-config-for-ews',
+            'resultsdbpy-unit-tests'
+        ],
+        'Commit-Queue': [
+            'configure-build',
+            'validate-patch',
+            'validate-commiter-and-reviewer',
+            'configuration',
+            'clean-up-git-repo',
+            'clean-and-update-working-directory',
+            'fetch-branch-references',
+            'show-identifier',
+            'verify-github-integrity',
+            'update-working-directory',
+            'apply-patch',
+            'validate-changelog-and-reviewer',
+            'find-modified-changelogs',
+            'kill-old-processes',
+            'compile-webkit',
+            'kill-old-processes',
+            'validate-patch',
+            'check-status-on-other-ewses',
+            'layout-tests',
+            'validate-patch',
+            'clean-and-update-working-directory',
+            'show-identifier',
+            'update-working-directory',
+            'apply-patch',
+            'create-local-git-commit',
+            'push-commit-to-webkit-repo',
+            'set-build-summary'
+        ]
+    }
</ins><span class="cx"> 
</span><del>-class TestCase(unittest.TestCase):
-    maxDiff = None
-
-    def assertBuildSteps(self, actual_steps, expected_steps):
-        assert all([isinstance(step, _BuildStepFactory) for step in actual_steps])
-        assert all([isinstance(step, _BuildStepFactory) for step in expected_steps])
-
-        # Convert to dictionaries because assertEqual() only knows how to diff Python built-in types.
-        def step_to_dict(step):
-            return {key: getattr(step, key) for key in step.compare_attrs}
-
-        actual_steps = [step_to_dict(step) for step in actual_steps]
-        expected_steps = [step_to_dict(step) for step in expected_steps]
-        self.assertEqual(actual_steps, expected_steps)
-
-
-class TestGenericFactory(TestCase):
</del><span class="cx">     def setUp(self):
</span><del>-        self.longMessage = True
</del><ins>+        cwd = os.path.dirname(os.path.abspath(__file__))
+        self.config = {}
+        loadConfig.loadBuilderConfig(self.config, is_test_mode_enabled=True, master_prefix_path=cwd)
</ins><span class="cx"> 
</span><del>-    def test_generic_factory(self):
-        factory = factories.Factory(platform='ios-simulator-13', configuration='release', architectures='arm64')
-        self.assertBuildSteps(factory.steps, [
-            _BuildStepFactory(steps.ConfigureBuild, platform='ios-simulator-13', configuration='release', architectures='arm64',
-                              buildOnly=True, triggers=None, triggered_by=None, remotes=None, additionalArguments=None),
-            _BuildStepFactory(steps.ValidatePatch),
-            _BuildStepFactory(steps.PrintConfiguration),
-            _BuildStepFactory(steps.CheckOutSource),
-            _BuildStepFactory(steps.CheckOutSpecificRevision),
-            _BuildStepFactory(steps.FetchBranches),
-            _BuildStepFactory(steps.ShowIdentifier),
-            _BuildStepFactory(steps.ApplyPatch),
-        ])
</del><ins>+    def test_all_expected_steps(self):
+        for builder in self.config['builders']:
+            buildSteps = []
+            for step in builder['factory'].steps:
+                buildSteps.append(step.factory.name)
+            self.assertTrue(builder['name'] in self.expected_steps, 'Missing expected steps for builder: %s\n Actual result is %s' % (builder['name'], buildSteps))
+            self.assertListEqual(self.expected_steps[builder['name']], buildSteps, msg="Expected steps don't match for builder %s" % builder['name'])
</ins><span class="cx"> 
</span><del>-    def test_generic_factory_with_check_relevance(self):
-        factory = factories.Factory(platform='ios-simulator-13', configuration='release', architectures='arm64', checkRelevance=True)
-        self.assertBuildSteps(factory.steps, [
-            _BuildStepFactory(steps.ConfigureBuild, platform='ios-simulator-13', configuration='release', architectures='arm64',
-                              buildOnly=True, triggers=None, triggered_by=None, remotes=None, additionalArguments=None),
-            _BuildStepFactory(steps.CheckPatchRelevance),
-            _BuildStepFactory(steps.ValidatePatch),
-            _BuildStepFactory(steps.PrintConfiguration),
-            _BuildStepFactory(steps.CheckOutSource),
-            _BuildStepFactory(steps.CheckOutSpecificRevision),
-            _BuildStepFactory(steps.FetchBranches),
-            _BuildStepFactory(steps.ShowIdentifier),
-            _BuildStepFactory(steps.ApplyPatch),
-        ])
-
-
-class TestTestsFactory(TestCase):
-    def setUp(self):
-        self.longMessage = True
-
-    def test_style_factory(self):
-        factory = factories.StyleFactory(platform='*', configuration=None, architectures=None)
-        self.assertBuildSteps(factory.steps, [
-            _BuildStepFactory(steps.ConfigureBuild, platform='*', configuration=None, architectures=None,
-                              buildOnly=False, triggers=None, remotes=None, additionalArguments=None),
-            _BuildStepFactory(steps.ValidatePatch),
-            _BuildStepFactory(steps.PrintConfiguration),
-            _BuildStepFactory(steps.CheckOutSource),
-            _BuildStepFactory(steps.FetchBranches),
-            _BuildStepFactory(steps.ShowIdentifier),
-            _BuildStepFactory(steps.UpdateWorkingDirectory),
-            _BuildStepFactory(steps.ApplyPatch),
-            _BuildStepFactory(steps.CheckStyle),
-        ])
-
-    def test_watchlist_factory(self):
-        factory = factories.WatchListFactory(platform='*', configuration=None, architectures=None)
-        self.assertBuildSteps(factory.steps, [
-            _BuildStepFactory(steps.ConfigureBuild, platform='*', configuration=None, architectures=None,
-                              buildOnly=False, triggers=None, remotes=None, additionalArguments=None),
-            _BuildStepFactory(steps.ValidatePatch),
-            _BuildStepFactory(steps.PrintConfiguration),
-            _BuildStepFactory(steps.CheckOutSource),
-            _BuildStepFactory(steps.FetchBranches),
-            _BuildStepFactory(steps.ShowIdentifier),
-            _BuildStepFactory(steps.UpdateWorkingDirectory),
-            _BuildStepFactory(steps.ApplyPatch),
-            _BuildStepFactory(steps.ApplyWatchList),
-        ])
-
-    def test_bindings_factory(self):
-        factory = factories.BindingsFactory(platform='*', configuration=None, architectures=None)
-        self.assertBuildSteps(factory.steps, [
-            _BuildStepFactory(steps.ConfigureBuild, platform='*', configuration=None, architectures=None,
-                              buildOnly=False, triggers=None, triggered_by=None, remotes=None, additionalArguments=None),
-            _BuildStepFactory(steps.CheckPatchRelevance),
-            _BuildStepFactory(steps.ValidatePatch),
-            _BuildStepFactory(steps.PrintConfiguration),
-            _BuildStepFactory(steps.CheckOutSource),
-            _BuildStepFactory(steps.CheckOutSpecificRevision),
-            _BuildStepFactory(steps.FetchBranches),
-            _BuildStepFactory(steps.ShowIdentifier),
-            _BuildStepFactory(steps.ApplyPatch),
-            _BuildStepFactory(steps.RunBindingsTests),
-        ])
-
-    def test_webkitperl_factory(self):
-        factory = factories.WebKitPerlFactory(platform='*', configuration=None, architectures=None)
-        self.assertBuildSteps(factory.steps, [
-            _BuildStepFactory(steps.ConfigureBuild, platform='*', configuration=None, architectures=None,
-                              buildOnly=False, triggers=None, triggered_by=None, remotes=None, additionalArguments=None),
-            _BuildStepFactory(steps.ValidatePatch),
-            _BuildStepFactory(steps.PrintConfiguration),
-            _BuildStepFactory(steps.CheckOutSource),
-            _BuildStepFactory(steps.CheckOutSpecificRevision),
-            _BuildStepFactory(steps.FetchBranches),
-            _BuildStepFactory(steps.ShowIdentifier),
-            _BuildStepFactory(steps.ApplyPatch),
-            _BuildStepFactory(steps.RunWebKitPerlTests),
-        ])
-
-    def test_webkitpy_factory(self):
-        factory = factories.WebKitPyFactory(platform='*', configuration=None, architectures=None)
-        self.assertBuildSteps(factory.steps, [
-            _BuildStepFactory(steps.ConfigureBuild, platform='*', configuration=None, architectures=None,
-                              buildOnly=False, triggers=None, triggered_by=None, remotes=None, additionalArguments=None),
-            _BuildStepFactory(steps.CheckPatchRelevance),
-            _BuildStepFactory(steps.ValidatePatch),
-            _BuildStepFactory(steps.PrintConfiguration),
-            _BuildStepFactory(steps.CheckOutSource),
-            _BuildStepFactory(steps.CheckOutSpecificRevision),
-            _BuildStepFactory(steps.FetchBranches),
-            _BuildStepFactory(steps.ShowIdentifier),
-            _BuildStepFactory(steps.ApplyPatch),
-            _BuildStepFactory(steps.RunWebKitPyPython2Tests),
-            _BuildStepFactory(steps.RunWebKitPyPython3Tests),
-            _BuildStepFactory(steps.SetBuildSummary),
-        ])
-
-    def test_services_factory(self):
-        factory = factories.ServicesFactory(platform='*', configuration=None, architectures=None)
-        self.assertBuildSteps(factory.steps, [
-            _BuildStepFactory(steps.ConfigureBuild, platform='*', configuration=None, architectures=None,
-                              buildOnly=False, triggers=None, triggered_by=None, remotes=None, additionalArguments=None),
-            _BuildStepFactory(steps.CheckPatchRelevance),
-            _BuildStepFactory(steps.ValidatePatch),
-            _BuildStepFactory(steps.PrintConfiguration),
-            _BuildStepFactory(steps.CheckOutSource),
-            _BuildStepFactory(steps.CheckOutSpecificRevision),
-            _BuildStepFactory(steps.FetchBranches),
-            _BuildStepFactory(steps.ShowIdentifier),
-            _BuildStepFactory(steps.ApplyPatch),
-            _BuildStepFactory(steps.RunBuildWebKitOrgUnitTests),
-            _BuildStepFactory(steps.RunBuildbotCheckConfigForBuildWebKit),
-            _BuildStepFactory(steps.RunEWSUnitTests),
-            _BuildStepFactory(steps.RunBuildbotCheckConfigForEWS),
-            _BuildStepFactory(steps.RunResultsdbpyTests),
-        ])
-
-
-class TestBuildFactory(TestCase):
-    def test_generic_build_factory(self):
-        factory = factories.BuildFactory(platform='mac-catalina', configuration='release', architectures=["x86_64"])
-        self.assertBuildSteps(factory.steps, [
-            _BuildStepFactory(steps.ConfigureBuild, platform='mac-catalina', configuration='release', architectures=["x86_64"],
-                              buildOnly=False, triggers=None, triggered_by=None, remotes=None, additionalArguments=None),
-            _BuildStepFactory(steps.ValidatePatch),
-            _BuildStepFactory(steps.PrintConfiguration),
-            _BuildStepFactory(steps.CheckOutSource),
-            _BuildStepFactory(steps.CheckOutSpecificRevision),
-            _BuildStepFactory(steps.FetchBranches),
-            _BuildStepFactory(steps.ShowIdentifier),
-            _BuildStepFactory(steps.ApplyPatch),
-            _BuildStepFactory(steps.KillOldProcesses),
-            _BuildStepFactory(steps.CompileWebKit, skipUpload=False),
-        ])
-
-    def test_macos_build_factory(self):
-        factory = factories.macOSBuildFactory(platform='mac-catalina', configuration='release', architectures=["x86_64"])
-        self.assertBuildSteps(factory.steps, [
-            _BuildStepFactory(steps.ConfigureBuild, platform='mac-catalina', configuration='release', architectures=["x86_64"],
-                              buildOnly=False, triggers=None, triggered_by=None, remotes=None, additionalArguments=None),
-            _BuildStepFactory(steps.ValidatePatch),
-            _BuildStepFactory(steps.PrintConfiguration),
-            _BuildStepFactory(steps.CheckOutSource),
-            _BuildStepFactory(steps.CheckOutSpecificRevision),
-            _BuildStepFactory(steps.FetchBranches),
-            _BuildStepFactory(steps.ShowIdentifier),
-            _BuildStepFactory(steps.ApplyPatch),
-            _BuildStepFactory(steps.KillOldProcesses),
-            _BuildStepFactory(steps.CompileWebKit, skipUpload=False),
-        ])
-
-    def test_macos_build_only_factory(self):
-        factory = factories.macOSBuildOnlyFactory(platform='mac-bigsur', configuration='release', architectures=["arm64"])
-        self.assertBuildSteps(factory.steps, [
-            _BuildStepFactory(steps.ConfigureBuild, platform='mac-bigsur', configuration='release', architectures=["arm64"],
-                              buildOnly=False, triggers=None, triggered_by=None, remotes=None, additionalArguments=None),
-            _BuildStepFactory(steps.CheckPatchRelevance),
-            _BuildStepFactory(steps.ValidatePatch),
-            _BuildStepFactory(steps.PrintConfiguration),
-            _BuildStepFactory(steps.CheckOutSource),
-            _BuildStepFactory(steps.CheckOutSpecificRevision),
-            _BuildStepFactory(steps.FetchBranches),
-            _BuildStepFactory(steps.ShowIdentifier),
-            _BuildStepFactory(steps.ApplyPatch),
-            _BuildStepFactory(steps.KillOldProcesses),
-            _BuildStepFactory(steps.CompileWebKit, skipUpload=True),
-        ])
-
-    def test_ios_build_factory(self):
-        factory = factories.iOSBuildFactory(platform='ios-simulator-13', configuration='release', architectures=["x86_64"])
-        self.assertBuildSteps(factory.steps, [
-            _BuildStepFactory(steps.ConfigureBuild, platform='ios-simulator-13', configuration='release', architectures=["x86_64"],
-                              buildOnly=False, triggers=None, triggered_by=None, remotes=None, additionalArguments=None),
-            _BuildStepFactory(steps.ValidatePatch),
-            _BuildStepFactory(steps.PrintConfiguration),
-            _BuildStepFactory(steps.CheckOutSource),
-            _BuildStepFactory(steps.CheckOutSpecificRevision),
-            _BuildStepFactory(steps.FetchBranches),
-            _BuildStepFactory(steps.ShowIdentifier),
-            _BuildStepFactory(steps.ApplyPatch),
-            _BuildStepFactory(steps.KillOldProcesses),
-            _BuildStepFactory(steps.CompileWebKit, skipUpload=False),
-        ])
-
-    def test_ios_embedded_build_factory(self):
-        factory = factories.iOSEmbeddedBuildFactory(platform='ios-13', configuration='release', architectures=["arm64"])
-        self.assertBuildSteps(factory.steps, [
-            _BuildStepFactory(steps.ConfigureBuild, platform='ios-13', configuration='release', architectures=["arm64"],
-                              buildOnly=False, triggers=None, triggered_by=None, remotes=None, additionalArguments=None),
-            _BuildStepFactory(steps.ValidatePatch),
-            _BuildStepFactory(steps.PrintConfiguration),
-            _BuildStepFactory(steps.CheckOutSource),
-            _BuildStepFactory(steps.CheckOutSpecificRevision),
-            _BuildStepFactory(steps.FetchBranches),
-            _BuildStepFactory(steps.ShowIdentifier),
-            _BuildStepFactory(steps.ApplyPatch),
-            _BuildStepFactory(steps.KillOldProcesses),
-            _BuildStepFactory(steps.CompileWebKit, skipUpload=True),
-        ])
-
-    def test_watchos_build_factory(self):
-        factory = factories.watchOSBuildFactory(platform='watchos-6', configuration='release', architectures=["arm64_32"])
-        self.assertBuildSteps(factory.steps, [
-            _BuildStepFactory(steps.ConfigureBuild, platform='watchos-6', configuration='release', architectures=["arm64_32"],
-                              buildOnly=False, triggers=None, triggered_by=None, remotes=None, additionalArguments=None),
-            _BuildStepFactory(steps.ValidatePatch),
-            _BuildStepFactory(steps.PrintConfiguration),
-            _BuildStepFactory(steps.CheckOutSource),
-            _BuildStepFactory(steps.CheckOutSpecificRevision),
-            _BuildStepFactory(steps.FetchBranches),
-            _BuildStepFactory(steps.ShowIdentifier),
-            _BuildStepFactory(steps.ApplyPatch),
-            _BuildStepFactory(steps.KillOldProcesses),
-            _BuildStepFactory(steps.CompileWebKit, skipUpload=True),
-        ])
-
-    def test_tvos_build_factory(self):
-        factory = factories.tvOSBuildFactory(platform='tvos-13', configuration='release', architectures=["arm64"])
-        self.assertBuildSteps(factory.steps, [
-            _BuildStepFactory(steps.ConfigureBuild, platform='tvos-13', configuration='release', architectures=["arm64"],
-                              buildOnly=False, triggers=None, triggered_by=None, remotes=None, additionalArguments=None),
-            _BuildStepFactory(steps.ValidatePatch),
-            _BuildStepFactory(steps.PrintConfiguration),
-            _BuildStepFactory(steps.CheckOutSource),
-            _BuildStepFactory(steps.CheckOutSpecificRevision),
-            _BuildStepFactory(steps.FetchBranches),
-            _BuildStepFactory(steps.ShowIdentifier),
-            _BuildStepFactory(steps.ApplyPatch),
-            _BuildStepFactory(steps.KillOldProcesses),
-            _BuildStepFactory(steps.CompileWebKit, skipUpload=True),
-        ])
-
-    def test_gtk_build_factory(self):
-        factory = factories.GTKBuildFactory(platform='gtk', configuration='release', architectures=['x86_64'])
-        self.assertBuildSteps(factory.steps, [
-            _BuildStepFactory(steps.ConfigureBuild, platform='gtk', configuration='release', architectures=['x86_64'],
-                              buildOnly=False, triggers=None, triggered_by=None, remotes=None, additionalArguments=None),
-            _BuildStepFactory(steps.ValidatePatch),
-            _BuildStepFactory(steps.PrintConfiguration),
-            _BuildStepFactory(steps.CheckOutSource),
-            _BuildStepFactory(steps.CheckOutSpecificRevision),
-            _BuildStepFactory(steps.FetchBranches),
-            _BuildStepFactory(steps.ShowIdentifier),
-            _BuildStepFactory(steps.ApplyPatch),
-            _BuildStepFactory(steps.KillOldProcesses),
-            _BuildStepFactory(steps.InstallGtkDependencies),
-            _BuildStepFactory(steps.CompileWebKit, skipUpload=False),
-            _BuildStepFactory(steps.InstallBuiltProduct),
-        ])
-
-    def test_wpe_factory(self):
-        factory = factories.WPEFactory(platform='wpe', configuration='release', architectures=['x86_64'])
-        self.assertBuildSteps(factory.steps, [
-            _BuildStepFactory(steps.ConfigureBuild, platform='wpe', configuration='release', architectures=['x86_64'],
-                              buildOnly=True, triggers=None, triggered_by=None, remotes=None, additionalArguments=None),
-            _BuildStepFactory(steps.ValidatePatch),
-            _BuildStepFactory(steps.PrintConfiguration),
-            _BuildStepFactory(steps.CheckOutSource),
-            _BuildStepFactory(steps.CheckOutSpecificRevision),
-            _BuildStepFactory(steps.FetchBranches),
-            _BuildStepFactory(steps.ShowIdentifier),
-            _BuildStepFactory(steps.ApplyPatch),
-            _BuildStepFactory(steps.KillOldProcesses),
-            _BuildStepFactory(steps.InstallWpeDependencies),
-            _BuildStepFactory(steps.CompileWebKit, skipUpload=True),
-        ])
-
-    def test_wincairo_factory(self):
-        factory = factories.WinCairoFactory(platform='wincairo', configuration='release', architectures=['x86_64'])
-        self.assertBuildSteps(factory.steps, [
-            _BuildStepFactory(steps.ConfigureBuild, platform='wincairo', configuration='release', architectures=['x86_64'],
-                              buildOnly=True, triggers=None, triggered_by=None, remotes=None, additionalArguments=None),
-            _BuildStepFactory(steps.ValidatePatch),
-            _BuildStepFactory(steps.PrintConfiguration),
-            _BuildStepFactory(steps.CheckOutSource),
-            _BuildStepFactory(steps.CheckOutSpecificRevision),
-            _BuildStepFactory(steps.FetchBranches),
-            _BuildStepFactory(steps.ShowIdentifier),
-            _BuildStepFactory(steps.ApplyPatch),
-            _BuildStepFactory(steps.KillOldProcesses),
-            _BuildStepFactory(steps.CompileWebKit, skipUpload=True),
-        ])
-
-    def test_jsc_mipsel_factory(self):
-        factory = factories.JSCBuildFactory(platform='jsc', configuration='release', architectures=["mipsel"])
-        self.assertBuildSteps(factory.steps, [
-            _BuildStepFactory(steps.ConfigureBuild, platform='jsc', configuration='release', architectures=["mipsel"],
-                              buildOnly=False, triggers=None, triggered_by=None, remotes=None, additionalArguments=None),
-            _BuildStepFactory(steps.CheckPatchRelevance),
-            _BuildStepFactory(steps.ValidatePatch),
-            _BuildStepFactory(steps.PrintConfiguration),
-            _BuildStepFactory(steps.CheckOutSource),
-            _BuildStepFactory(steps.CheckOutSpecificRevision),
-            _BuildStepFactory(steps.FetchBranches),
-            _BuildStepFactory(steps.ShowIdentifier),
-            _BuildStepFactory(steps.ApplyPatch),
-            _BuildStepFactory(steps.KillOldProcesses),
-            _BuildStepFactory(steps.CompileJSC),
-        ])
-
-    def test_jsc_armv7_factory(self):
-        factory = factories.JSCBuildFactory(platform='jsc', configuration='release', architectures=["armv7"])
-        self.assertBuildSteps(factory.steps, [
-            _BuildStepFactory(steps.ConfigureBuild, platform='jsc', configuration='release', architectures=["armv7"],
-                              buildOnly=False, triggers=None, triggered_by=None, remotes=None, additionalArguments=None),
-            _BuildStepFactory(steps.CheckPatchRelevance),
-            _BuildStepFactory(steps.ValidatePatch),
-            _BuildStepFactory(steps.PrintConfiguration),
-            _BuildStepFactory(steps.CheckOutSource),
-            _BuildStepFactory(steps.CheckOutSpecificRevision),
-            _BuildStepFactory(steps.FetchBranches),
-            _BuildStepFactory(steps.ShowIdentifier),
-            _BuildStepFactory(steps.ApplyPatch),
-            _BuildStepFactory(steps.KillOldProcesses),
-            _BuildStepFactory(steps.CompileJSC),
-        ])
-
-
-class TestBuildAndTestsFactory(TestCase):
-    def test_windows_factory(self):
-        factory = factories.WindowsFactory(platform='win', configuration='release', architectures=["x86_64"])
-        self.assertBuildSteps(factory.steps, [
-            _BuildStepFactory(steps.ConfigureBuild, platform='win', configuration='release', architectures=["x86_64"],
-                              buildOnly=False, triggers=None, triggered_by=None, remotes=None, additionalArguments=None),
-            _BuildStepFactory(steps.CheckPatchRelevance),
-            _BuildStepFactory(steps.ValidatePatch),
-            _BuildStepFactory(steps.PrintConfiguration),
-            _BuildStepFactory(steps.CheckOutSource),
-            _BuildStepFactory(steps.CheckOutSpecificRevision),
-            _BuildStepFactory(steps.FetchBranches),
-            _BuildStepFactory(steps.ShowIdentifier),
-            _BuildStepFactory(steps.ApplyPatch),
-            _BuildStepFactory(steps.KillOldProcesses),
-            _BuildStepFactory(steps.CompileWebKit, skipUpload=True),
-            _BuildStepFactory(steps.ValidatePatch, verifyBugClosed=False, addURLs=False),
-            _BuildStepFactory(steps.RunWebKit1Tests),
-            _BuildStepFactory(steps.SetBuildSummary),
-        ])
-
-
-class TestCommitQueueFactory(TestCase):
-    def test_commit_queue_factory(self):
-        factory = factories.CommitQueueFactory(platform='mac-catalina', configuration='release', architectures=["x86_64"])
-        self.assertBuildSteps(factory.steps, [
-            _BuildStepFactory(steps.ConfigureBuild, platform='mac-catalina', configuration='release', architectures=["x86_64"],
-                              buildOnly=False, triggers=None, remotes=None, additionalArguments=None),
-            _BuildStepFactory(steps.ValidatePatch, verifycqplus=True),
-            _BuildStepFactory(steps.ValidateCommiterAndReviewer),
-            _BuildStepFactory(steps.PrintConfiguration),
-            _BuildStepFactory(steps.CleanGitRepo),
-            _BuildStepFactory(steps.CheckOutSource, repourl='https://git.webkit.org/git/WebKit-https'),
-            _BuildStepFactory(steps.FetchBranches),
-            _BuildStepFactory(steps.ShowIdentifier),
-            _BuildStepFactory(steps.VerifyGitHubIntegrity),
-            _BuildStepFactory(steps.UpdateWorkingDirectory),
-            _BuildStepFactory(steps.ApplyPatch),
-            _BuildStepFactory(steps.ValidateChangeLogAndReviewer),
-            _BuildStepFactory(steps.FindModifiedChangeLogs),
-            _BuildStepFactory(steps.KillOldProcesses),
-            _BuildStepFactory(steps.CompileWebKit, skipUpload=True),
-            _BuildStepFactory(steps.KillOldProcesses),
-            _BuildStepFactory(steps.ValidatePatch, addURLs=False, verifycqplus=True),
-            _BuildStepFactory(steps.CheckPatchStatusOnEWSQueues),
-            _BuildStepFactory(steps.RunWebKitTests),
-            _BuildStepFactory(steps.ValidatePatch, addURLs=False, verifycqplus=True),
-            _BuildStepFactory(steps.CheckOutSource, repourl='https://git.webkit.org/git/WebKit-https'),
-            _BuildStepFactory(steps.ShowIdentifier),
-            _BuildStepFactory(steps.UpdateWorkingDirectory),
-            _BuildStepFactory(steps.ApplyPatch),
-            _BuildStepFactory(steps.CreateLocalGITCommit),
-            _BuildStepFactory(steps.PushCommitToWebKitRepo),
-            _BuildStepFactory(steps.SetBuildSummary),
-        ])
-
-
-class TestLayoutTestsFactory(TestCase):
-    def test_macos_wk1_release_factory(self):
-        factory = factories.macOSWK1Factory(platform='mac-catalina', configuration='release', architectures=["x86_64"])
-        self.assertBuildSteps(factory.steps, [
-            _BuildStepFactory(steps.ConfigureBuild, platform='mac-catalina', configuration='release', architectures=["x86_64"],
-                              buildOnly=False, triggers=None, triggered_by=None, remotes=None, additionalArguments=None),
-            _BuildStepFactory(steps.CheckPatchRelevance),
-            _BuildStepFactory(steps.ValidatePatch),
-            _BuildStepFactory(steps.PrintConfiguration),
-            _BuildStepFactory(steps.CheckOutSource),
-            _BuildStepFactory(steps.CheckOutSpecificRevision),
-            _BuildStepFactory(steps.FetchBranches),
-            _BuildStepFactory(steps.ShowIdentifier),
-            _BuildStepFactory(steps.ApplyPatch),
-            _BuildStepFactory(steps.DownloadBuiltProduct),
-            _BuildStepFactory(steps.ExtractBuiltProduct),
-            _BuildStepFactory(steps.WaitForCrashCollection),
-            _BuildStepFactory(steps.KillOldProcesses),
-            _BuildStepFactory(steps.FindModifiedLayoutTests, skipBuildIfNoResult=False),
-            _BuildStepFactory(steps.RunWebKitTestsInStressMode, num_iterations=10),
-            _BuildStepFactory(steps.RunWebKit1Tests),
-            _BuildStepFactory(steps.TriggerCrashLogSubmission),
-            _BuildStepFactory(steps.SetBuildSummary),
-        ])
-
-    def test_macos_wk1_debug_factory(self):
-        factory = factories.macOSWK1Factory(platform='mac-catalina', configuration='debug', architectures=["x86_64"])
-        self.assertBuildSteps(factory.steps, [
-            _BuildStepFactory(steps.ConfigureBuild, platform='mac-catalina', configuration='debug', architectures=["x86_64"],
-                              buildOnly=False, triggers=None, triggered_by=None, remotes=None, additionalArguments=None),
-            _BuildStepFactory(steps.CheckPatchRelevance),
-            _BuildStepFactory(steps.ValidatePatch),
-            _BuildStepFactory(steps.PrintConfiguration),
-            _BuildStepFactory(steps.CheckOutSource),
-            _BuildStepFactory(steps.CheckOutSpecificRevision),
-            _BuildStepFactory(steps.FetchBranches),
-            _BuildStepFactory(steps.ShowIdentifier),
-            _BuildStepFactory(steps.ApplyPatch),
-            _BuildStepFactory(steps.DownloadBuiltProduct),
-            _BuildStepFactory(steps.ExtractBuiltProduct),
-            _BuildStepFactory(steps.WaitForCrashCollection),
-            _BuildStepFactory(steps.KillOldProcesses),
-            _BuildStepFactory(steps.FindModifiedLayoutTests, skipBuildIfNoResult=False),
-            _BuildStepFactory(steps.RunWebKitTestsInStressMode, num_iterations=10),
-            _BuildStepFactory(steps.RunWebKit1Tests),
-            _BuildStepFactory(steps.TriggerCrashLogSubmission),
-            _BuildStepFactory(steps.SetBuildSummary),
-        ])
-
-    def test_macos_wk2_factory(self):
-        factory = factories.macOSWK2Factory(platform='mac-catalina', configuration='release', architectures=["x86_64"])
-        self.assertBuildSteps(factory.steps, [
-            _BuildStepFactory(steps.ConfigureBuild, platform='mac-catalina', configuration='release', architectures=["x86_64"],
-                              buildOnly=False, triggers=None, triggered_by=None, remotes=None, additionalArguments=None),
-            _BuildStepFactory(steps.ValidatePatch),
-            _BuildStepFactory(steps.PrintConfiguration),
-            _BuildStepFactory(steps.CheckOutSource),
-            _BuildStepFactory(steps.CheckOutSpecificRevision),
-            _BuildStepFactory(steps.FetchBranches),
-            _BuildStepFactory(steps.ShowIdentifier),
-            _BuildStepFactory(steps.ApplyPatch),
-            _BuildStepFactory(steps.DownloadBuiltProduct),
-            _BuildStepFactory(steps.ExtractBuiltProduct),
-            _BuildStepFactory(steps.WaitForCrashCollection),
-            _BuildStepFactory(steps.KillOldProcesses),
-            _BuildStepFactory(steps.FindModifiedLayoutTests, skipBuildIfNoResult=False),
-            _BuildStepFactory(steps.RunWebKitTestsInStressMode, num_iterations=10),
-            _BuildStepFactory(steps.RunWebKitTests),
-            _BuildStepFactory(steps.TriggerCrashLogSubmission),
-            _BuildStepFactory(steps.SetBuildSummary),
-        ])
-
-    def test_ios_wk2_factory(self):
-        factory = factories.iOSTestsFactory(platform='ios-simulator-13', configuration='release', architectures=["x86_64"])
-        self.assertBuildSteps(factory.steps, [
-            _BuildStepFactory(steps.ConfigureBuild, platform='ios-simulator-13', configuration='release', architectures=["x86_64"],
-                              buildOnly=False, triggers=None, triggered_by=None, remotes=None, additionalArguments=None),
-            _BuildStepFactory(steps.ValidatePatch),
-            _BuildStepFactory(steps.PrintConfiguration),
-            _BuildStepFactory(steps.CheckOutSource),
-            _BuildStepFactory(steps.CheckOutSpecificRevision),
-            _BuildStepFactory(steps.FetchBranches),
-            _BuildStepFactory(steps.ShowIdentifier),
-            _BuildStepFactory(steps.ApplyPatch),
-            _BuildStepFactory(steps.DownloadBuiltProduct),
-            _BuildStepFactory(steps.ExtractBuiltProduct),
-            _BuildStepFactory(steps.WaitForCrashCollection),
-            _BuildStepFactory(steps.KillOldProcesses),
-            _BuildStepFactory(steps.FindModifiedLayoutTests, skipBuildIfNoResult=False),
-            _BuildStepFactory(steps.RunWebKitTestsInStressMode, num_iterations=10),
-            _BuildStepFactory(steps.RunWebKitTests),
-            _BuildStepFactory(steps.TriggerCrashLogSubmission),
-            _BuildStepFactory(steps.SetBuildSummary),
-        ])
-
-    def test_gtk_factory(self):
-        factory = factories.GTKTestsFactory(platform='gtk', configuration='release', architectures=["x86_64"])
-        self.assertBuildSteps(factory.steps, [
-            _BuildStepFactory(steps.ConfigureBuild, platform='gtk', configuration='release', architectures=["x86_64"],
-                              buildOnly=False, triggers=None, triggered_by=None, remotes=None, additionalArguments=None),
-            _BuildStepFactory(steps.ValidatePatch),
-            _BuildStepFactory(steps.PrintConfiguration),
-            _BuildStepFactory(steps.CheckOutSource),
-            _BuildStepFactory(steps.CheckOutSpecificRevision),
-            _BuildStepFactory(steps.FetchBranches),
-            _BuildStepFactory(steps.ShowIdentifier),
-            _BuildStepFactory(steps.ApplyPatch),
-            _BuildStepFactory(steps.InstallGtkDependencies),
-            _BuildStepFactory(steps.DownloadBuiltProduct),
-            _BuildStepFactory(steps.ExtractBuiltProduct),
-            _BuildStepFactory(steps.KillOldProcesses),
-            _BuildStepFactory(steps.FindModifiedLayoutTests, skipBuildIfNoResult=False),
-            _BuildStepFactory(steps.RunWebKitTestsInStressMode, num_iterations=10),
-            _BuildStepFactory(steps.RunWebKitTests),
-            _BuildStepFactory(steps.SetBuildSummary),
-        ])
-
-
-class TestJSCBuildFactory(TestCase):
-    def test_jsc_mipsel_factory(self):
-        factory = factories.JSCBuildFactory(platform='jsc', configuration='release', architectures=["mipsel"])
-        self.assertBuildSteps(factory.steps, [
-            _BuildStepFactory(steps.ConfigureBuild, platform='jsc', configuration='release', architectures=["mipsel"],
-                              buildOnly=False, triggers=None, triggered_by=None, remotes=None, additionalArguments=None),
-            _BuildStepFactory(steps.CheckPatchRelevance),
-            _BuildStepFactory(steps.ValidatePatch),
-            _BuildStepFactory(steps.PrintConfiguration),
-            _BuildStepFactory(steps.CheckOutSource),
-            _BuildStepFactory(steps.CheckOutSpecificRevision),
-            _BuildStepFactory(steps.FetchBranches),
-            _BuildStepFactory(steps.ShowIdentifier),
-            _BuildStepFactory(steps.ApplyPatch),
-            _BuildStepFactory(steps.KillOldProcesses),
-            _BuildStepFactory(steps.CompileJSC),
-        ])
-
-    def test_jsc_armv7_factory(self):
-        factory = factories.JSCBuildFactory(platform='jsc', configuration='release', architectures=["armv7"])
-        self.assertBuildSteps(factory.steps, [
-            _BuildStepFactory(steps.ConfigureBuild, platform='jsc', configuration='release', architectures=["armv7"],
-                              buildOnly=False, triggers=None, triggered_by=None, remotes=None, additionalArguments=None),
-            _BuildStepFactory(steps.CheckPatchRelevance),
-            _BuildStepFactory(steps.ValidatePatch),
-            _BuildStepFactory(steps.PrintConfiguration),
-            _BuildStepFactory(steps.CheckOutSource),
-            _BuildStepFactory(steps.CheckOutSpecificRevision),
-            _BuildStepFactory(steps.FetchBranches),
-            _BuildStepFactory(steps.ShowIdentifier),
-            _BuildStepFactory(steps.ApplyPatch),
-            _BuildStepFactory(steps.KillOldProcesses),
-            _BuildStepFactory(steps.CompileJSC),
-        ])
-
-
-class TestStressTestFactory(TestCase):
-    def test_stress_test_factory(self):
-        factory = factories.StressTestFactory(platform='mac-catalina', configuration='release', architectures=["x86_64"])
-        self.assertBuildSteps(factory.steps, [
-            _BuildStepFactory(steps.ConfigureBuild, platform='mac-catalina', configuration='release', architectures=["x86_64"],
-                              buildOnly=False, triggers=None, triggered_by=None, remotes=None, additionalArguments=None),
-            _BuildStepFactory(steps.FindModifiedLayoutTests),
-            _BuildStepFactory(steps.ValidatePatch),
-            _BuildStepFactory(steps.PrintConfiguration),
-            _BuildStepFactory(steps.CheckOutSource),
-            _BuildStepFactory(steps.CheckOutSpecificRevision),
-            _BuildStepFactory(steps.FetchBranches),
-            _BuildStepFactory(steps.ShowIdentifier),
-            _BuildStepFactory(steps.ApplyPatch),
-            _BuildStepFactory(steps.DownloadBuiltProduct),
-            _BuildStepFactory(steps.ExtractBuiltProduct),
-            _BuildStepFactory(steps.WaitForCrashCollection),
-            _BuildStepFactory(steps.KillOldProcesses),
-            _BuildStepFactory(steps.RunWebKitTestsInStressMode),
-            _BuildStepFactory(steps.TriggerCrashLogSubmission),
-            _BuildStepFactory(steps.SetBuildSummary),
-        ])
-
-
-class TestJSCBuildAndTestsFactory(TestCase):
-    def test_jsc_mipsel_factory(self):
-        factory = factories.JSCBuildFactory(platform='jsc', configuration='release', architectures=["mipsel"])
-        self.assertBuildSteps(factory.steps, [
-            _BuildStepFactory(steps.ConfigureBuild, platform='jsc', configuration='release', architectures=["mipsel"],
-                              buildOnly=False, triggers=None, triggered_by=None, remotes=None, additionalArguments=None),
-            _BuildStepFactory(steps.CheckPatchRelevance),
-            _BuildStepFactory(steps.ValidatePatch),
-            _BuildStepFactory(steps.PrintConfiguration),
-            _BuildStepFactory(steps.CheckOutSource),
-            _BuildStepFactory(steps.CheckOutSpecificRevision),
-            _BuildStepFactory(steps.FetchBranches),
-            _BuildStepFactory(steps.ShowIdentifier),
-            _BuildStepFactory(steps.ApplyPatch),
-            _BuildStepFactory(steps.KillOldProcesses),
-            _BuildStepFactory(steps.CompileJSC),
-        ])
-
-    def test_jsc_armv7_factory(self):
-        factory = factories.JSCBuildFactory(platform='jsc', configuration='release', architectures=["armv7"])
-        self.assertBuildSteps(factory.steps, [
-            _BuildStepFactory(steps.ConfigureBuild, platform='jsc', configuration='release', architectures=["armv7"],
-                              buildOnly=False, triggers=None, triggered_by=None, remotes=None, additionalArguments=None),
-            _BuildStepFactory(steps.CheckPatchRelevance),
-            _BuildStepFactory(steps.ValidatePatch),
-            _BuildStepFactory(steps.PrintConfiguration),
-            _BuildStepFactory(steps.CheckOutSource),
-            _BuildStepFactory(steps.CheckOutSpecificRevision),
-            _BuildStepFactory(steps.FetchBranches),
-            _BuildStepFactory(steps.ShowIdentifier),
-            _BuildStepFactory(steps.ApplyPatch),
-            _BuildStepFactory(steps.KillOldProcesses),
-            _BuildStepFactory(steps.CompileJSC),
-        ])
-
-
-class TestJSCTestsFactory(TestCase):
-    def test_jsc_mipsel_factory(self):
-        factory = factories.JSCTestsFactory(platform='jsc', configuration='release', architectures=["mipsel"])
-        self.assertBuildSteps(factory.steps, [
-            _BuildStepFactory(steps.ConfigureBuild, platform='jsc', configuration='release', architectures=["mipsel"],
-                              buildOnly=False, triggers=None, triggered_by=None, remotes=None, additionalArguments=None),
-            _BuildStepFactory(steps.CheckPatchRelevance),
-            _BuildStepFactory(steps.ValidatePatch),
-            _BuildStepFactory(steps.PrintConfiguration),
-            _BuildStepFactory(steps.CheckOutSource),
-            _BuildStepFactory(steps.CheckOutSpecificRevision),
-            _BuildStepFactory(steps.FetchBranches),
-            _BuildStepFactory(steps.ShowIdentifier),
-            _BuildStepFactory(steps.ApplyPatch),
-            _BuildStepFactory(steps.DownloadBuiltProduct),
-            _BuildStepFactory(steps.ExtractBuiltProduct),
-            _BuildStepFactory(steps.KillOldProcesses),
-            _BuildStepFactory(steps.RunJavaScriptCoreTests),
-        ])
-
-    def test_jsc_armv7_factory(self):
-        factory = factories.JSCTestsFactory(platform='jsc', configuration='release', architectures=["armv7"])
-        self.assertBuildSteps(factory.steps, [
-            _BuildStepFactory(steps.ConfigureBuild, platform='jsc', configuration='release', architectures=["armv7"],
-                              buildOnly=False, triggers=None, triggered_by=None, remotes=None, additionalArguments=None),
-            _BuildStepFactory(steps.CheckPatchRelevance),
-            _BuildStepFactory(steps.ValidatePatch),
-            _BuildStepFactory(steps.PrintConfiguration),
-            _BuildStepFactory(steps.CheckOutSource),
-            _BuildStepFactory(steps.CheckOutSpecificRevision),
-            _BuildStepFactory(steps.FetchBranches),
-            _BuildStepFactory(steps.ShowIdentifier),
-            _BuildStepFactory(steps.ApplyPatch),
-            _BuildStepFactory(steps.DownloadBuiltProduct),
-            _BuildStepFactory(steps.ExtractBuiltProduct),
-            _BuildStepFactory(steps.KillOldProcesses),
-            _BuildStepFactory(steps.RunJavaScriptCoreTests),
-        ])
</del><ins>+    def test_unnecessary_expected_steps(self):
+        builders = set()
+        for builder in self.config['builders']:
+            builders.add(builder['name'])
+        for builder in self.expected_steps:
+            self.assertTrue(builder in builders, "Builder %s doesn't exist, but has unnecessary expected steps" % builder)
</ins></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (281321 => 281322)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog    2021-08-20 17:01:00 UTC (rev 281321)
+++ trunk/Tools/ChangeLog       2021-08-20 17:12:40 UTC (rev 281322)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2021-08-20  Carlos Alberto Lopez Perez  <clopez@igalia.com>
+
+        [ews-build.webkit.org] Add unit test with the expected build steps for each queue
+        https://bugs.webkit.org/show_bug.cgi?id=229319
+
+        Reviewed by Aakash Jain.
+
+        Add a unit test listing all the expected build steps for each queue
+        like the one added in r281286 for build.webkit.org
+        Also remove the previous unit tests to not duplicate test functionality.
+        And replace doble-quotes with single-ones on the test for build.webkit.org
+
+        * CISupport/build-webkit-org/factories_unittest.py:
+        (TestExpectedBuildSteps):
+        (TestExpectedBuildSteps.test_all_expected_steps):
+        (TestExpectedBuildSteps.test_unnecessary_expected_steps):
+        * CISupport/ews-build/factories_unittest.py:
+        (TestExpectedBuildSteps):
+        (TestExpectedBuildSteps.setUp):
+        (TestExpectedBuildSteps.test_all_expected_steps):
+        (TestExpectedBuildSteps.test_unnecessary_expected_steps):
+
</ins><span class="cx"> 2021-08-20  Youenn Fablet  <youenn@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Remove all WTR output before Content-Type:text/plain for WebRTC tests in case of known excessive logging
</span></span></pre>
</div>
</div>

</body>
</html>