mathieu/os-rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rollup merge of #131694 - c6c7:fixup-failing-fuchsia-tests, r=Urgau

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

[A recent commit in LLVM](ab930ee7ca) 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`
This commit is contained in:
Urgau 2024-10-16 12:03:40 +02:00 • committed by GitHub
commit 042ea4e95e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 31 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
src/ci/docker/scripts/fuchsia-test-runner.py
View file

@ -193,18 +193,38 @@ class TestEnvironment:
stderr=subprocess.STDOUT,
)
if process.returncode:
self.env_logger.error(
f"llvm-readelf failed for binary {binary} with output {process.stdout}"
e = f"llvm-readelf failed for binary {binary} with output {process.stdout}"
self.env_logger.error(e)
raise Exception(e)
try:
elf_output = json.loads(process.stdout)
except Exception as e:
e.add_note(f"Failed to read JSON from llvm-readelf for binary {binary}")
e.add_note(f"stdout: {process.stdout}")
raise
try:
note_sections = elf_output[0]["NoteSections"]
except Exception as e:
e.add_note(
f'Failed to read "NoteSections" from llvm-readelf for binary {binary}'
)
raise Exception(f"Unreadable build-id for binary {binary}")
data = json.loads(process.stdout)
if len(data) != 1:
raise Exception(f"Unreadable output from llvm-readelf for binary {binary}")
notes = data[0]["Notes"]
for note in notes:
note_section = note["NoteSection"]
if note_section["Name"] == ".note.gnu.build-id":
return note_section["Note"]["Build ID"]
e.add_note(f"elf_output: {elf_output}")
raise
for entry in note_sections:
try:
note_section = entry["NoteSection"]
if note_section["Name"] == ".note.gnu.build-id":
return note_section["Notes"][0]["Build ID"]
except Exception as e:
e.add_note(
f'Failed to read ".note.gnu.build-id" from NoteSections \
entry in llvm-readelf for binary {binary}'
)
e.add_note(f"NoteSections: {note_sections}")
raise
raise Exception(f"Build ID not found for binary {binary}")
def generate_buildid_dir(