From 68548cd8c4dc98826b7bb0feb60bd1b1c2aaed99 Mon Sep 17 00:00:00 2001 From: Erik Schnetter Date: Mon, 1 Jan 2024 14:01:30 -0500 Subject: [PATCH 1/3] Update Objectfile to 0.4.0 --- test/Project.toml | 2 +- test/dependencies.jl | 32 ++++++++++++++++++-------------- 2 files changed, 19 insertions(+), 15 deletions(-) diff --git a/test/Project.toml b/test/Project.toml index abc28635..929f77c5 100644 --- a/test/Project.toml +++ b/test/Project.toml @@ -13,4 +13,4 @@ UUIDs = "cf7118a7-6976-5b1a-9a39-7adc72f591a4" [compat] ConstructionBase = "1.5.1" -ObjectFile = "0.3.6" +ObjectFile = "0.3.6, 0.4" diff --git a/test/dependencies.jl b/test/dependencies.jl index 5664c94a..2b0f030f 100644 --- a/test/dependencies.jl +++ b/test/dependencies.jl @@ -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"] else ["Zlib.log.gz"] end @@ -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 @@ -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 From 1b0e99302d6843811bd437b72e5917c617a7ccae Mon Sep 17 00:00:00 2001 From: Erik Schnetter Date: Mon, 1 Jan 2024 14:03:12 -0500 Subject: [PATCH 2/3] Test more Julia versions --- .github/workflows/ci.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index adac94a8..7d935de5 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -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" From cdadbede0a6e1f97cba5e9539370caed21319b3f Mon Sep 17 00:00:00 2001 From: Erik Schnetter Date: Wed, 3 Jan 2024 16:39:15 -0500 Subject: [PATCH 3/3] Require ObjectFile 0.4 --- test/Project.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/Project.toml b/test/Project.toml index 929f77c5..01438dd4 100644 --- a/test/Project.toml +++ b/test/Project.toml @@ -13,4 +13,4 @@ UUIDs = "cf7118a7-6976-5b1a-9a39-7adc72f591a4" [compat] ConstructionBase = "1.5.1" -ObjectFile = "0.3.6, 0.4" +ObjectFile = "0.4"