Skip to content

fix tests and bump CI llvm to 15 #35

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

Merged
merged 3 commits into from
Aug 6, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,13 @@ jobs:
- name: Install LLVM
run: |
wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add -
sudo add-apt-repository "deb http://apt.llvm.org/focal/ llvm-toolchain-focal-13 main"
sudo add-apt-repository "deb http://apt.llvm.org/focal/ llvm-toolchain-focal-15 main"
sudo apt-get update
sudo apt-get install --no-install-recommends --yes llvm-13 llvm-13-tools
sudo apt-get install --no-install-recommends --yes llvm-15 llvm-15-tools
- name: Install lit
run: pip install lit
- name: Run lit testsuite
run: lit -v --path "$PWD/target/release/:/usr/lib/llvm-13/bin/" ./tests
run: lit -v --path "$PWD/target/release/:/usr/lib/llvm-15/bin/" ./tests

fmt:
name: rustfmt
Expand Down
61 changes: 35 additions & 26 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ $ cargo build
To run the tests, first install the relevant dependencies:

```shell-session
$ apt install --no-install-recommends --yes llvm-13 llvm-13-tools
$ apt install --no-install-recommends --yes llvm-15 llvm-15-tools
$ pip install lit
```

Expand Down
2 changes: 1 addition & 1 deletion tests/compress-fail.test
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ RUN: not thorin %p/inputs/empty-compressed-section.dwo -o %t 2>&1 | FileCheck %s
RUN: not thorin %p/inputs/invalid-compressed.dwo -o %t 2>&1 | FileCheck --check-prefix=INVALID %s

CHECK: Error: Failed to add `{{.*}}` to DWARF package
CHECK: Invalid ELF GNU compressed section header
CHECK: Invalid GNU compressed section header

# `llvm-dwp` fails to decompress this, but `thorin` is able to but the contents aren't meaningful.
INVALID: Error: Failed to add `{{.*}}/invalid-compressed.dwo` to DWARF package
Expand Down
2 changes: 1 addition & 1 deletion tests/tu-units-v5.s
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
# CHECK-DAG: .debug_info.dwo contents:
# CHECK: 0x00000000: Type Unit: length = 0x00000017, format = DWARF32, version = 0x0005, unit_type = DW_UT_split_type, abbr_offset = 0x0000, addr_size = 0x08, name = '', type_signature = [[TUID1:.*]], type_offset = 0x0019 (next unit at 0x0000001b)
# CHECK: 0x0000001b: Type Unit: length = 0x00000017, format = DWARF32, version = 0x0005, unit_type = DW_UT_split_type, abbr_offset = 0x0000, addr_size = 0x08, name = '', type_signature = [[TUID2:.*]], type_offset = 0x0019 (next unit at 0x00000036)
# CHECK_DAG: .debug_tu_index contents:
# CHECK-DAG: .debug_tu_index contents:
# CHECK: version = 5, units = 2, slots = 4
# CHECK: Index Signature INFO ABBREV
# CHECK: 1 [[TUID1]] [0x00000000, 0x0000001b) [0x00000000, 0x00000010)
Expand Down
2 changes: 1 addition & 1 deletion tests/type-dedup-v5.test
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@
# RUN: thorin %t-a.dwo %t-b.dwo -o %t.dwp
# RUN: llvm-dwarfdump -debug-tu-index %t.dwp | FileCheck %s

# CHECK_DAG: .debug_tu_index contents:
# CHECK-DAG: .debug_tu_index contents:
# CHECK: version = 5, units = 1, slots = 2
Loading