Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[ews-build.webkit.org] Use new-style test in TestWithFailureCount #7965

Merged
merged 1 commit into from
Jan 5, 2023
Merged

[ews-build.webkit.org] Use new-style test in TestWithFailureCount #7965

merged 1 commit into from
Jan 5, 2023

Conversation

JonWBedard
Copy link
Member

@JonWBedard JonWBedard commented Dec 21, 2022 •
edited by webkit-early-warning-system

26498f2

[ews-build.webkit.org] Use new-style test in TestWithFailureCount
https://bugs.webkit.org/show_bug.cgi?id=249729
rdar://103604782

Reviewed by Dewei Zhu.

* Tools/CISupport/ews-build/steps.py:
(TestWithFailureCount.run): Convert start to new-style 'run' commands.
(TestWithFailureCount.countFailures): Accept returncode instead of command result.
(CheckStyle.countFailures): Accept returncode instead of command result.
(customBuildFlag): Renamed from appendCustomBuildFlags, detatch from step type.
(CompileWebKit.start): Replace appendCustomBuildFlags with customBuildFlag.
(RunJavaScriptCoreTests.start): Ditto.
(RunWebKitTests.setLayoutTestCommand): Ditto.
(RunAPITests.run): Convert start to new-style 'run' command.
(RunAPITests.countFailures): Accept returncode instead of command result.
(RunAPITests.doOnFailure): Set of specific actions to take upon failure.
(ReRunAPITests.doOnFailure): Ditto.
(RunAPITestsWithoutChange):
(TestWithFailureCount.start): Deleted.
(TestWithFailureCount.commandComplete): Deleted.
(TestWithFailureCount.evaluateCommand): Deleted.
(appendCustomBuildFlags): Renamed customBuildFlag.
(RunAPITests.start): Deleted.
(RunAPITests.evaluateCommand): Deleted.
(ReRunAPITests.evaluateCommand): Deleted.
(RunAPITestsWithoutChange.evaluateCommand): Deleted.

Canonical link: https://commits.webkit.org/258497@main

36126a6

Misc iOS, tvOS & watchOS macOS Linux Windows
❌ 🧪 style ✅ 🛠 ios ✅ 🛠 mac ✅ 🛠 wpe ✅ 🛠 🧪 win
✅ 🧪 bindings ✅ 🛠 ios-sim ✅ 🛠 mac-AS-debug ✅ 🛠 gtk ✅ 🛠 wincairo
✅ 🧪 webkitperl ✅ 🧪 ios-wk2 ✅ 🧪 api-mac ✅ 🧪 gtk-wk2
✅ 🧪 api-ios ✅ 🧪 mac-wk1 ❌ 🧪 api-gtk
✅ 🛠 tv ✅ 🧪 mac-wk2
✅ 🛠 tv-sim ✅ 🧪 mac-AS-debug-wk2
✅ 🧪 services ✅ 🛠 watch ✅ 🧪 mac-wk2-stress
✅ 🛠 watch-sim
❌ 🛠 🧪 unsafe-merge

@JonWBedard JonWBedard self-assigned this Dec 21, 2022
@JonWBedard JonWBedard added the Tools / Tests Tools in the Tools directory, build issues, test infrastructure, and bugs in test cases label Dec 21, 2022
@webkit-early-warning-system
Copy link
Collaborator

EWS run on previous version of this PR (hash 4984f54)

Misc iOS, tvOS & watchOS macOS Linux Windows
✅ 🧪 style ✅ 🛠 ios ✅ 🛠 mac ✅ 🛠 wpe ✅ 🛠 🧪 win
✅ 🧪 bindings ✅ 🛠 ios-sim ✅ 🛠 mac-AS-debug ✅ 🛠 gtk ✅ 🛠 wincairo
✅ 🧪 webkitperl ✅ 🧪 ios-wk2   🧪 api-mac   🧪 gtk-wk2
  🧪 api-ios ✅ 🧪 mac-wk1   🧪 api-gtk
✅ 🛠 tv ✅ 🧪 mac-wk2
✅ 🛠 tv-sim ✅ 🧪 mac-AS-debug-wk2
✅ 🧪 services ✅ 🛠 watch ✅ 🧪 mac-wk2-stress
✅ 🛠 watch-sim

dewei-zhu
dewei-zhu approved these changes Dec 21, 2022
View reviewed changes
Copy link
Contributor

@dewei-zhu dewei-zhu left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

r=me

Tools/CISupport/ews-build/steps.py Outdated
Comment on lines 4371 to 4372
'--{0}'.format(self.getProperty('configuration')),
'--json-output={0}'.format(self.jsonFileName)]
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Those indentation also need to be updated?
Also if this is python3 only, we can do

...
'--json-output={0}'.format(self.jsonFileName), *customBuildFlag(platform, self.getProperty('fullPlatform'))]

@JonWBedard JonWBedard force-pushed the eng/ews-build-webkit-org-Use-new-style-test-in-TestWithFailureCount branch from 4984f54 to 36126a6 Compare December 21, 2022 23:21
@webkit-early-warning-system
Copy link
Collaborator

EWS run on current version of this PR (hash 36126a6)

Misc iOS, tvOS & watchOS macOS Linux Windows
❌ 🧪 style ✅ 🛠 ios ✅ 🛠 mac ✅ 🛠 wpe ✅ 🛠 🧪 win
✅ 🧪 bindings ✅ 🛠 ios-sim ✅ 🛠 mac-AS-debug ✅ 🛠 gtk ✅ 🛠 wincairo
✅ 🧪 webkitperl ✅ 🧪 ios-wk2 ✅ 🧪 api-mac ✅ 🧪 gtk-wk2
✅ 🧪 api-ios ✅ 🧪 mac-wk1 ❌ 🧪 api-gtk
✅ 🛠 tv ✅ 🧪 mac-wk2
✅ 🛠 tv-sim ✅ 🧪 mac-AS-debug-wk2
✅ 🧪 services ✅ 🛠 watch ✅ 🧪 mac-wk2-stress
✅ 🛠 watch-sim
❌ 🛠 🧪 unsafe-merge

@JonWBedard
Copy link
Member Author

I intend to land this when I get back in January. While I'm confident that it works, it seems prudent to at least be available when it's deployed.

@JonWBedard JonWBedard added the unsafe-merge-queue Applied to send a pull request to merge-queue, but skip building and testing label Jan 5, 2023
@webkit-early-warning-system webkit-early-warning-system force-pushed the eng/ews-build-webkit-org-Use-new-style-test-in-TestWithFailureCount branch from 36126a6 to ee06c9a Compare January 5, 2023 19:22
@JonWBedard
[ews-build.webkit.org] Use new-style test in TestWithFailureCount
26498f2 
https://bugs.webkit.org/show_bug.cgi?id=249729
rdar://103604782

Reviewed by Dewei Zhu.

* Tools/CISupport/ews-build/steps.py:
(TestWithFailureCount.run): Convert start to new-style 'run' commands.
(TestWithFailureCount.countFailures): Accept returncode instead of command result.
(CheckStyle.countFailures): Accept returncode instead of command result.
(customBuildFlag): Renamed from appendCustomBuildFlags, detatch from step type.
(CompileWebKit.start): Replace appendCustomBuildFlags with customBuildFlag.
(RunJavaScriptCoreTests.start): Ditto.
(RunWebKitTests.setLayoutTestCommand): Ditto.
(RunAPITests.run): Convert start to new-style 'run' command.
(RunAPITests.countFailures): Accept returncode instead of command result.
(RunAPITests.doOnFailure): Set of specific actions to take upon failure.
(ReRunAPITests.doOnFailure): Ditto.
(RunAPITestsWithoutChange):
(TestWithFailureCount.start): Deleted.
(TestWithFailureCount.commandComplete): Deleted.
(TestWithFailureCount.evaluateCommand): Deleted.
(appendCustomBuildFlags): Renamed customBuildFlag.
(RunAPITests.start): Deleted.
(RunAPITests.evaluateCommand): Deleted.
(ReRunAPITests.evaluateCommand): Deleted.
(RunAPITestsWithoutChange.evaluateCommand): Deleted.

Canonical link: https://commits.webkit.org/258497@main
@webkit-early-warning-system webkit-early-warning-system force-pushed the eng/ews-build-webkit-org-Use-new-style-test-in-TestWithFailureCount branch from ee06c9a to 26498f2 Compare January 5, 2023 19:25
@webkit-commit-queue
Copy link
Collaborator

Committed 258497@main (26498f2): https://commits.webkit.org/258497@main

Reviewed commits have been landed. Closing PR #7965 and removing active labels.

@webkit-early-warning-system webkit-early-warning-system merged commit 26498f2 into WebKit:main Jan 5, 2023
@webkit-commit-queue webkit-commit-queue removed the unsafe-merge-queue Applied to send a pull request to merge-queue, but skip building and testing label Jan 5, 2023
@JonWBedard JonWBedard deleted the eng/ews-build-webkit-org-Use-new-style-test-in-TestWithFailureCount branch January 6, 2023 17:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dewei-zhu dewei-zhu dewei-zhu approved these changes

@aj062 aj062 Awaiting requested review from aj062 aj062 is a code owner

@ryanhaddad ryanhaddad Awaiting requested review from ryanhaddad ryanhaddad is a code owner

Assignees

@JonWBedard JonWBedard

Labels
Tools / Tests Tools in the Tools directory, build issues, test infrastructure, and bugs in test cases
Projects
None yet
Milestone
No milestone
4 participants
@JonWBedard @webkit-early-warning-system @webkit-commit-queue @dewei-zhu