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.

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

Update lldbWebKitTester's CLANG_DEBUG_INFORMATION_LEVEL workaround for workspace builds #1692

Conversation

emw-apple
Copy link
Contributor

@emw-apple emw-apple commented Jun 22, 2022

1b9d289

Update lldbWebKitTester's CLANG_DEBUG_INFORMATION_LEVEL workaround for workspace builds
https://bugs.webkit.org/show_bug.cgi?id=241863

Reviewed by Alexey Proskuryakov.

When building lldbWebKitTester, we used to transparently filter out the
CLANG_DEBUG_INFORMATION_LEVEL setting that buildbot passes. Now that
builds are a single xcodebuild invocation, we cannot do that.

Introduce a WK_OVERRIDE_DEBUG_INFORMATION_LEVEL setting, which
lldbWebKitTester sets to its required debug info level. Change
buildbot's overrides to prefer this setting over `line-tables-only`.

* Tools/CISupport/build-webkit-org/steps.py:
(CompileWebKit.start):
* Tools/CISupport/ews-build/steps.py:
(CompileWebKit.start):
* Tools/Scripts/webkitdirs.pm:
(buildXCodeProject):
* Tools/lldb/lldbWebKitTester/Configurations/lldbWebKitTester.xcconfig:

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

@emw-apple emw-apple self-assigned this Jun 22, 2022
@emw-apple emw-apple added Tools / Tests Tools in the Tools directory, build issues, test infrastructure, and bugs in test cases WebKit Nightly Build labels Jun 22, 2022
self.setCommand(self.command + ['DEBUG_INFORMATION_FORMAT=dwarf-with-dsym'])
self.setCommand(self.command + ['CLANG_DEBUG_INFORMATION_LEVEL=line-tables-only'])
self.setCommand(self.command + ['CLANG_DEBUG_INFORMATION_LEVEL=$(WK_OVERRIDE_DEBUG_INFORMATION_LEVEL:default=line-tables-only)'])
Copy link
Contributor

Choose a reason for hiding this comment

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

How does this work with CMake?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

This code is Xcode-only. Just outside the diff context is an if platform in ('mac', 'ios', 'tvos', 'watchos') statement.

@emw-apple emw-apple added the merge-queue Applied to send a pull request to merge-queue label Jun 23, 2022
…r workspace builds

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

Reviewed by Alexey Proskuryakov.

When building lldbWebKitTester, we used to transparently filter out the
CLANG_DEBUG_INFORMATION_LEVEL setting that buildbot passes. Now that
builds are a single xcodebuild invocation, we cannot do that.

Introduce a WK_OVERRIDE_DEBUG_INFORMATION_LEVEL setting, which
lldbWebKitTester sets to its required debug info level. Change
buildbot's overrides to prefer this setting over `line-tables-only`.

* Tools/CISupport/build-webkit-org/steps.py:
(CompileWebKit.start):
* Tools/CISupport/ews-build/steps.py:
(CompileWebKit.start):
* Tools/Scripts/webkitdirs.pm:
(buildXCodeProject):
* Tools/lldb/lldbWebKitTester/Configurations/lldbWebKitTester.xcconfig:

Canonical link: https://commits.webkit.org/251808@main
@webkit-early-warning-system webkit-early-warning-system force-pushed the eng/fix-workspace-build-lldbWebKitTester-debug-info branch from 4521e41 to 1b9d289 Compare June 23, 2022 23:50
@webkit-commit-queue
Copy link
Collaborator

Committed 251808@main (1b9d289): https://commits.webkit.org/251808@main

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

@webkit-early-warning-system webkit-early-warning-system merged commit 1b9d289 into WebKit:main Jun 23, 2022
@webkit-commit-queue webkit-commit-queue removed the merge-queue Applied to send a pull request to merge-queue label Jun 23, 2022
yury-s pushed a commit to yury-s/WebKit that referenced this pull request Jul 29, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Tools / Tests Tools in the Tools directory, build issues, test infrastructure, and bugs in test cases
Projects
None yet
4 participants