From a073d84f872a834b027c120245d6b0617204590e Mon Sep 17 00:00:00 2001 From: Tim Besard Date: Fri, 24 Apr 2026 19:35:21 +0200 Subject: [PATCH] Switch to a unified LLVM_utils JLL. --- Project.toml | 6 +++--- src/FileCheck.jl | 22 ++-------------------- 2 files changed, 5 insertions(+), 23 deletions(-) diff --git a/Project.toml b/Project.toml index a01e2fa..4e025ae 100644 --- a/Project.toml +++ b/Project.toml @@ -1,11 +1,11 @@ name = "FileCheck" uuid = "4e644321-382b-4b05-b0b6-5d23c3d944fb" -authors = ["Tim Besard "] version = "1.1.2" +authors = ["Tim Besard "] [deps] -LLVM_jll = "86de99a1-58d6-5da7-8064-bd56ce2e322c" +LLVM_utils_unified_jll = "0def2053-1a45-54bc-bfc1-6427e7aae702" [compat] +LLVM_utils_unified_jll = "0.1.0" julia = "1.10" -LLVM_jll = "15,16,18,20" diff --git a/src/FileCheck.jl b/src/FileCheck.jl index 7a1d70a..d00f336 100644 --- a/src/FileCheck.jl +++ b/src/FileCheck.jl @@ -1,27 +1,9 @@ module FileCheck -import LLVM_jll +import LLVM_utils_unified_jll export @filecheck -global filecheck_path::String -function __init__() - global filecheck_path = joinpath(LLVM_jll.artifact_dir, "tools", "FileCheck") -end - -function filecheck_exe(; adjust_PATH::Bool=true, adjust_LIBPATH::Bool=true) - env = Base.invokelatest( - LLVM_jll.JLLWrappers.adjust_ENV!, - copy(ENV), - LLVM_jll.PATH[], - LLVM_jll.LIBPATH[], - adjust_PATH, - adjust_LIBPATH - ) - - return Cmd(Cmd([filecheck_path]); env) -end - function filecheck(f, input; throws::Union{Nothing, Type{<:Exception}}=nothing, match_full_lines::Bool=false, @@ -82,7 +64,7 @@ function filecheck(f, input; # now pass the collected output to FileCheck filecheck_io = Pipe() - cmd = `$(filecheck_exe()) --color $path` + cmd = `$(LLVM_utils_unified_jll.llvm_FileCheck()) --color $path` match_full_lines && (cmd = `$cmd --match-full-lines`) strict_whitespace && (cmd = `$cmd --strict-whitespace`) ignore_case && (cmd = `$cmd --ignore-case`)