Skip to content

Commit e359503

Browse files
Jiaming LiCQ Bot
authored andcommitted
Revert "[zxdb][e2e_tests] Disable pretty_types test"
This reverts commit b0ff58d. Reason for revert: Likely broke core.x64-cxx20, core.x64-debug, core.x64-gce Bug: 418038360 Original change's description: > [zxdb][e2e_tests] Disable pretty_types test > > An upstream libc++ change > (llvm/llvm-project#134819) modified the > `std::map` node structure such that the private `__c_` field no longer > exists, but `pretty_type_manager.cc` still emits this field. > > This CL disables the pretty_types test to unblock rolling Fuchsia with newer revisions of the toolchain. A TODO is put into place to > update the c++ globs. > > Bug: 418038360 > Change-Id: I45c6aa8eab8da1e74998ee9a77245da4e8467959 > Reviewed-on: https://fuchsia-review.googlesource.com/c/fuchsia/+/1278648 > Fuchsia-Auto-Submit: Caslyn Tonelli <[email protected]> > Commit-Queue: Auto-Submit <auto-submit-builder@fuchsia-internal-service-accts.iam.gserviceaccount.com> > Reviewed-by: Jacob Rutherford <[email protected]> Bug: 418038360 No-Presubmit: true No-Tree-Checks: true No-Try: true Change-Id: I4760777afeb0d0c2c8bd8a6a573b543933f8c477 Reviewed-on: https://fuchsia-review.googlesource.com/c/fuchsia/+/1279165 Commit-Queue: Jiaming Li <[email protected]> Reviewed-by: RubberStamper 🤖 <[email protected]>
1 parent be69d56 commit e359503

File tree

1 file changed

+6
-6
lines changed
  • src/developer/debug/e2e_tests/inferiors

1 file changed

+6
-6
lines changed

src/developer/debug/e2e_tests/inferiors/BUILD.gn

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -110,13 +110,12 @@ inferior("cpp_functions") {
110110
cflags = [ "-fno-inline-functions" ]
111111
}
112112

113-
# TODO(https://fxbug.dev/418038360): Update c++ globs for std::map nodes.
114-
# inferior("pretty_types") {
115-
# sources = [ "pretty_types.cc" ]
113+
inferior("pretty_types") {
114+
sources = [ "pretty_types.cc" ]
116115

117-
# # TODO(https://fxbug.dev/42180987): workaround for toolchain issues, see bug
118-
# deps = [ "//build/config/fuchsia:uses-outline-atomics-fxbug98632" ]
119-
# }
116+
# TODO(https://fxbug.dev/42180987): workaround for toolchain issues, see bug
117+
deps = [ "//build/config/fuchsia:uses-outline-atomics-fxbug98632" ]
118+
}
120119

121120
# Creates some types that are linked in to the pretty_types_rust binary below to make sure the
122121
# expression evaluation doesn't fail when types shadow member variable names.
@@ -192,6 +191,7 @@ fuchsia_package("zxdb_e2e_inferiors") {
192191
":cpp_functions",
193192
":inlined_crasher",
194193
":loop",
194+
":pretty_types",
195195
":pretty_types_rust",
196196
":rust_functions",
197197
":simplified_templates",

0 commit comments

Comments
 (0)