Skip to content

Conversation

c6c7
Copy link
Contributor

@c6c7 c6c7 commented Oct 14, 2024

A recent commit in LLVM modified the JSON output of LLVM. The LLVM change renamed "Notes" to "NoteSections" and inserted a new "Notes" key nested under each "NoteSection".

This change shores up exceptions around reading the JSON output of llvm-readelf and reads from "NoteSections" instead of the non-existent "Notes".

r? @erickt

@rustbot
Copy link
Collaborator

rustbot commented Oct 14, 2024

Failed to set assignee to erickt: invalid assignee

Note: Only org members with at least the repository "read" role, users with write permissions, or people who have commented on the PR may be assigned.

@rustbot rustbot added A-testsuite Area: The testsuite used to check the correctness of rustc S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-infra Relevant to the infrastructure team, which will review and decide on the PR/issue. labels Oct 14, 2024
@c6c7
Copy link
Contributor Author

c6c7 commented Oct 14, 2024

r? @tmandry

@rust-log-analyzer

This comment has been minimized.

@rust-log-analyzer

This comment has been minimized.

@c6c7 c6c7 force-pushed the fixup-failing-fuchsia-tests branch from a749f21 to 4c3e9cf Compare October 15, 2024 14:19
@rust-log-analyzer

This comment has been minimized.

@c6c7 c6c7 force-pushed the fixup-failing-fuchsia-tests branch from 4c3e9cf to 0ffa066 Compare October 15, 2024 14:34
@rust-log-analyzer

This comment has been minimized.

@c6c7 c6c7 force-pushed the fixup-failing-fuchsia-tests branch 2 times, most recently from 7fb0b09 to f4c3da4 Compare October 15, 2024 15:33
@c6c7
Copy link
Contributor Author

c6c7 commented Oct 15, 2024

Verified this change fixes the error fuchsia-test-runner.py was encountering.

@rust-log-analyzer

This comment has been minimized.

@c6c7 c6c7 force-pushed the fixup-failing-fuchsia-tests branch 2 times, most recently from 47f8529 to caded8d Compare October 15, 2024 15:51
…-readelf

[A recent commit in LLVM](llvm/llvm-project@ab930ee) modified the JSON output of LLVM. The LLVM change renamed "Notes" to "NoteSections" and inserted a new "Notes" key nested under each "NoteSection".

This change shores up exceptions around reading the JSON output of llvm-readelf and reads from "NoteSections" instead of the non-existent "Notes".
@c6c7 c6c7 force-pushed the fixup-failing-fuchsia-tests branch from caded8d to 5d178e1 Compare October 15, 2024 15:59
@c6c7
Copy link
Contributor Author

c6c7 commented Oct 15, 2024

r? @djkoloski

@rustbot
Copy link
Collaborator

rustbot commented Oct 15, 2024

Failed to set assignee to djkoloski: invalid assignee

Note: Only org members with at least the repository "read" role, users with write permissions, or people who have commented on the PR may be assigned.

@erickt
Copy link
Contributor

erickt commented Oct 15, 2024

lgtm, but I don't have commit access anymore. We can see if someone's available on zulip that could help.

@c6c7
Copy link
Contributor Author

c6c7 commented Oct 15, 2024

Started a topic in Zulip.

@c6c7
Copy link
Contributor Author

c6c7 commented Oct 15, 2024

r? infra-ci

@rustbot rustbot assigned Kobzol and unassigned tmandry Oct 15, 2024
@Urgau
Copy link
Member

Urgau commented Oct 15, 2024

This script is basically managed by the Fuchsia team, the changes don't look outrageous and the PR was soft-approved by @erickt (one of the target maintainer).

Good enough for me to give it a somewhat blind approval.
@bors r+ rollup

@bors
Copy link
Collaborator

bors commented Oct 15, 2024

📌 Commit 5d178e1 has been approved by Urgau

It is now in the queue for this repository.

@bors bors removed the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Oct 15, 2024
@bors bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Oct 15, 2024
bors added a commit to rust-lang-ci/rust that referenced this pull request Oct 16, 2024
Rollup of 10 pull requests

Successful merges:

 - rust-lang#131582 (Add wasm32-unknown-emscripten platform support document)
 - rust-lang#131694 (Make fuchsia-test-runner.py compatible with new JSON output from llvm-readelf)
 - rust-lang#131700 (Fix match_same_arms in stable_mir)
 - rust-lang#131712 (Mark the unstable LazyCell::into_inner const)
 - rust-lang#131746 (Relax a memory order in `once_box`)
 - rust-lang#131754 (Don't report bivariance error when nesting a struct with field errors into another struct)
 - rust-lang#131760 (llvm: Match aarch64 data layout to new LLVM layout)
 - rust-lang#131764 (Fix unnecessary nesting in run-make test output directories)
 - rust-lang#131766 (Add mailmap entry for my dev-desktop setup)
 - rust-lang#131771 (Handle gracefully true/false in `cfg(target(..))` compact)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 042ea4e into rust-lang:master Oct 16, 2024
6 checks passed
@rustbot rustbot added this to the 1.84.0 milestone Oct 16, 2024
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Oct 16, 2024
Rollup merge of rust-lang#131694 - c6c7:fixup-failing-fuchsia-tests, r=Urgau

Make fuchsia-test-runner.py compatible with new JSON output from llvm-readelf

[A recent commit in LLVM](llvm/llvm-project@ab930ee) modified the JSON output of LLVM. The LLVM change renamed "Notes" to "NoteSections" and inserted a new "Notes" key nested under each "NoteSection".

This change shores up exceptions around reading the JSON output of llvm-readelf and reads from "NoteSections" instead of the non-existent "Notes".

r? `@erickt`
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-testsuite Area: The testsuite used to check the correctness of rustc S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-infra Relevant to the infrastructure team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants