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.

Sign up for GitHub

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

Jump to bottom

Update Objectfile to 0.4.0 #363

Merged
merged 3 commits into from
Jan 11, 2024
Merged

Update Objectfile to 0.4.0 #363

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
68548cd
Update Objectfile to 0.4.0
eschnett Jan 1, 2024
1b0e993
Test more Julia versions
eschnett Jan 1, 2024
cdadbed
Require ObjectFile 0.4
eschnett Jan 3, 2024
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
8 changes: 8 additions & 0 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,14 @@ jobs:
squashfs: true
julia-version: "1.8"

- runner: privileged
squashfs: true
julia-version: "1.9"

- runner: privileged
squashfs: true
julia-version: "1.10"

- runner: privileged
squashfs: true
julia-version: "nightly"
Expand Down
2 changes: 1 addition & 1 deletion test/Project.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ UUIDs = "cf7118a7-6976-5b1a-9a39-7adc72f591a4"

[compat]
ConstructionBase = "1.5.1"
ObjectFile = "0.3.6"
ObjectFile = "0.4"
32 changes: 18 additions & 14 deletions test/dependencies.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ end
# Since Julia v1.9 Zlib_jll doesn't have logs directory at all
@static if VERSION < v"1.9-DEV"
zlib_log_files = if os(platform) == "macos"
["Zlib.log.gz", "fix_identity_mismatch_libz.1.2.11.dylib.log.gz", "ldid_libz.1.2.11.dylib.log.gz"]
["Zlib.log.gz", "fix_identity_mismatch_libz.1.2.12.dylib.log.gz", "ldid_libz.1.2.12.dylib.log.gz"]
Copy link
Member

Choose a reason for hiding this comment

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

Why did you change this? How did it work before?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I changed it because this test failed. I don't know how it worked before – I assume the test was written when libz @1.2.11 was current.

Copy link
Member

Choose a reason for hiding this comment

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

I was very confused about why this didn't fail in CI (nor it failed for me recently), but this code is run only on macOS (and running Docker in macOS in CI is a mess: #133). I guess the change is fine then.

else
["Zlib.log.gz"]
end
Expand Down Expand Up @@ -338,13 +338,15 @@ end
]
platform = Platform("x86_64", "linux")
test_setup_dependencies(prefix, dependencies, platform)
readmeta(joinpath(destdir(dir, platform), "lib", "libz.so")) do oh
symbols = symbol_name.(Symbols(oh))
# The platform didn't specify the sanitizer, the library shouldn't contain
# "asan", "msan", or "tsan" symbols
@test !any(contains("asan_"), symbols)
@test !any(contains("msan_"), symbols)
@test !any(contains("tsan_"), symbols)
readmeta(joinpath(destdir(dir, platform), "lib", "libz.so")) do ohs
foreach(ohs) do oh
symbols = symbol_name.(Symbols(oh))
# The platform didn't specify the sanitizer, the library shouldn't contain
# "asan", "msan", or "tsan" symbols
@test !any(contains("asan_"), symbols)
@test !any(contains("msan_"), symbols)
@test !any(contains("tsan_"), symbols)
end
end
end
with_temp_project() do dir
Expand All @@ -354,12 +356,14 @@ end
]
platform = Platform("x86_64", "linux"; sanitize="memory")
test_setup_dependencies(prefix, dependencies, platform)
readmeta(joinpath(destdir(dir, platform), "lib", "libz.so")) do oh
symbols = symbol_name.(Symbols(oh))
# Make sure the library contains only "msan" symbols
@test !any(contains("asan_"), symbols)
@test any(contains("msan_"), symbols)
@test !any(contains("tsan_"), symbols)
readmeta(joinpath(destdir(dir, platform), "lib", "libz.so")) do ohs
foreach(ohs) do oh
symbols = symbol_name.(Symbols(oh))
# Make sure the library contains only "msan" symbols
@test !any(contains("asan_"), symbols)
@test any(contains("msan_"), symbols)
@test !any(contains("tsan_"), symbols)
end
end
end
end
Expand Down
Loading