Diff
Modified: trunk/Tools/CISupport/ews-build/factories.py (272654 => 272655)
--- trunk/Tools/CISupport/ews-build/factories.py 2021-02-10 15:58:57 UTC (rev 272654)
+++ trunk/Tools/CISupport/ews-build/factories.py 2021-02-10 16:18:39 UTC (rev 272655)
@@ -28,7 +28,7 @@
CheckPatchStatusOnEWSQueues, CheckStyle, CompileJSC, CompileWebKit, ConfigureBuild, CreateLocalGITCommit,
DownloadBuiltProduct, ExtractBuiltProduct, FindModifiedChangeLogs, InstallGtkDependencies,
InstallWpeDependencies, KillOldProcesses, PrintConfiguration, PushCommitToWebKitRepo,
- RunAPITests, RunBindingsTests, RunBuildWebKitOrgUnitTests, RunEWSBuildbotCheckConfig, RunEWSUnitTests,
+ RunAPITests, RunBindingsTests, RunBuildWebKitOrgUnitTests, RunBuildWebKitOrgOldUnitTests, RunEWSBuildbotCheckConfig, RunEWSUnitTests,
RunResultsdbpyTests, RunJavaScriptCoreTests, RunWebKit1Tests, RunWebKitPerlTests, RunWebKitPyPython2Tests,
RunWebKitPyPython3Tests, RunWebKitTests, SetBuildSummary, ShowIdentifier, TriggerCrashLogSubmission, UpdateWorkingDirectory,
ValidatePatch, ValidateChangeLogAndReviewer, ValidateCommiterAndReviewer, WaitForCrashCollection)
@@ -245,10 +245,11 @@
class ServicesFactory(Factory):
def __init__(self, platform, configuration=None, architectures=None, additionalArguments=None, **kwargs):
Factory.__init__(self, platform=platform, configuration=configuration, architectures=architectures, buildOnly=False, additionalArguments=additionalArguments, checkRelevance=True)
+ self.addStep(RunBuildWebKitOrgUnitTests())
+ self.addStep(RunBuildWebKitOrgOldUnitTests())
self.addStep(RunEWSUnitTests())
self.addStep(RunEWSBuildbotCheckConfig())
self.addStep(RunResultsdbpyTests())
- self.addStep(RunBuildWebKitOrgUnitTests())
class CommitQueueFactory(factory.BuildFactory):
Modified: trunk/Tools/CISupport/ews-build/factories_unittest.py (272654 => 272655)
--- trunk/Tools/CISupport/ews-build/factories_unittest.py 2021-02-10 15:58:57 UTC (rev 272654)
+++ trunk/Tools/CISupport/ews-build/factories_unittest.py 2021-02-10 16:18:39 UTC (rev 272655)
@@ -165,10 +165,11 @@
_BuildStepFactory(steps.CheckOutSpecificRevision),
_BuildStepFactory(steps.ShowIdentifier),
_BuildStepFactory(steps.ApplyPatch),
+ _BuildStepFactory(steps.RunBuildWebKitOrgUnitTests),
+ _BuildStepFactory(steps.RunBuildWebKitOrgOldUnitTests),
_BuildStepFactory(steps.RunEWSUnitTests),
_BuildStepFactory(steps.RunEWSBuildbotCheckConfig),
_BuildStepFactory(steps.RunResultsdbpyTests),
- _BuildStepFactory(steps.RunBuildWebKitOrgUnitTests),
])
Modified: trunk/Tools/CISupport/ews-build/steps.py (272654 => 272655)
--- trunk/Tools/CISupport/ews-build/steps.py 2021-02-10 15:58:57 UTC (rev 272654)
+++ trunk/Tools/CISupport/ews-build/steps.py 2021-02-10 16:18:39 UTC (rev 272655)
@@ -1196,7 +1196,7 @@
return shell.ShellCommand.evaluateCommand(self, cmd)
-class RunBuildWebKitOrgUnitTests(shell.ShellCommand):
+class RunBuildWebKitOrgOldUnitTests(shell.ShellCommand):
name = 'build-webkit-old-unit-tests'
description = ['build-webkit-unit-tests running']
command = ['python', 'steps_unittest_old.py']
@@ -1210,6 +1210,24 @@
return {u'step': u'Failed build.webkit.org old unit tests'}
+class RunBuildWebKitOrgUnitTests(shell.ShellCommand):
+ name = 'build-webkit-org-unit-tests'
+ description = ['build-webkit-unit-tests running']
+ command = ['python3', 'runUnittests.py', 'build-webkit-org']
+
+ def __init__(self, **kwargs):
+ super(RunBuildWebKitOrgUnitTests, self).__init__(workdir='build/Tools/CISupport', timeout=2 * 60, logEnviron=False, **kwargs)
+
+ def start(self):
+ self.workerEnvironment['USE_BUILDBOT_VERSION2'] = 'True'
+ return shell.ShellCommand.start(self)
+
+ def getResultSummary(self):
+ if self.results == SUCCESS:
+ return {u'step': u'Passed build.webkit.org unit tests'}
+ return {u'step': u'Failed build.webkit.org unit tests'}
+
+
class RunEWSUnitTests(shell.ShellCommand):
name = 'ews-unit-tests'
description = ['ews-unit-tests running']
Modified: trunk/Tools/CISupport/ews-build/steps_unittest.py (272654 => 272655)
--- trunk/Tools/CISupport/ews-build/steps_unittest.py 2021-02-10 15:58:57 UTC (rev 272654)
+++ trunk/Tools/CISupport/ews-build/steps_unittest.py 2021-02-10 16:18:39 UTC (rev 272655)
@@ -47,7 +47,7 @@
FindModifiedChangeLogs, InstallGtkDependencies, InstallWpeDependencies, KillOldProcesses,
PrintConfiguration, PushCommitToWebKitRepo, ReRunAPITests, ReRunJavaScriptCoreTests, ReRunWebKitPerlTests,
ReRunWebKitTests, RunAPITests, RunAPITestsWithoutPatch, RunBindingsTests, RunBuildWebKitOrgUnitTests,
- RunEWSBuildbotCheckConfig, RunEWSUnitTests, RunResultsdbpyTests, RunJavaScriptCoreTests,
+ RunBuildWebKitOrgOldUnitTests, RunEWSBuildbotCheckConfig, RunEWSUnitTests, RunResultsdbpyTests, RunJavaScriptCoreTests,
RunJSCTestsWithoutPatch, RunWebKit1Tests, RunWebKitPerlTests, RunWebKitPyPython2Tests,
RunWebKitPyPython3Tests, RunWebKitTests, RunWebKitTestsWithoutPatch, TestWithFailureCount, ShowIdentifier,
Trigger, TransferToS3, UnApplyPatchIfRequired, UpdateWorkingDirectory, UploadBuiltProduct,
@@ -734,6 +734,44 @@
def test_success(self):
self.setupStep(RunBuildWebKitOrgUnitTests())
self.expectRemoteCommands(
+ ExpectShell(workdir='build/Tools/CISupport',
+ timeout=120,
+ logEnviron=False,
+ command=['python3', 'runUnittests.py', 'build-webkit-org'],
+ env={'USE_BUILDBOT_VERSION2': 'True'},
+ )
+ + 0,
+ )
+ self.expectOutcome(result=SUCCESS, state_string='Passed build.webkit.org unit tests')
+ return self.runStep()
+
+ def test_failure(self):
+ self.setupStep(RunBuildWebKitOrgUnitTests())
+ self.expectRemoteCommands(
+ ExpectShell(workdir='build/Tools/CISupport',
+ timeout=120,
+ logEnviron=False,
+ command=['python3', 'runUnittests.py', 'build-webkit-org'],
+ env={'USE_BUILDBOT_VERSION2': 'True'},
+ )
+ + ExpectShell.log('stdio', stdout='Unhandled Error. Traceback (most recent call last): Keys in cmd missing from expectation: [logfiles.json]')
+ + 2,
+ )
+ self.expectOutcome(result=FAILURE, state_string='Failed build.webkit.org unit tests')
+ return self.runStep()
+
+
+class TestRunBuildWebKitOrgOldUnitTests(BuildStepMixinAdditions, unittest.TestCase):
+ def setUp(self):
+ self.longMessage = True
+ return self.setUpBuildStep()
+
+ def tearDown(self):
+ return self.tearDownBuildStep()
+
+ def test_success(self):
+ self.setupStep(RunBuildWebKitOrgOldUnitTests())
+ self.expectRemoteCommands(
ExpectShell(workdir='build/Tools/CISupport/build-webkit-org',
timeout=120,
logEnviron=False,
@@ -745,7 +783,7 @@
return self.runStep()
def test_failure(self):
- self.setupStep(RunBuildWebKitOrgUnitTests())
+ self.setupStep(RunBuildWebKitOrgOldUnitTests())
self.expectRemoteCommands(
ExpectShell(workdir='build/Tools/CISupport/build-webkit-org',
timeout=120,
Modified: trunk/Tools/ChangeLog (272654 => 272655)
--- trunk/Tools/ChangeLog 2021-02-10 15:58:57 UTC (rev 272654)
+++ trunk/Tools/ChangeLog 2021-02-10 16:18:39 UTC (rev 272655)
@@ -1,3 +1,18 @@
+2021-02-10 Aakash Jain <[email protected]>
+
+ [ews] Add build-step to run build.webkit.org new unit-tests
+ https://bugs.webkit.org/show_bug.cgi?id=219454
+
+ Reviewed by Jonathan Bedard.
+
+ * CISupport/ews-build/steps.py:
+ (RunBuildWebKitOrgOldUnitTests): Renamed.
+ (RunBuildWebKitOrgUnitTests): Build step to run build.webkit.org new unit-tests.
+ * CISupport/ews-build/steps_unittest.py: Added unit-tests.
+ * CISupport/ews-build/factories.py:
+ (ServicesFactory.__init__): Added the new build-step, also change the step order slightly.
+ * CISupport/ews-build/factories_unittest.py:
+
2021-02-10 Brent Fulgham <[email protected]>
Create stub methods to support finer-grained control over loading
