copy libzstd over for trimming tests

comment-out bad ccall with a fixme

Revert "comment-out bad ccall with a fixme"

This reverts commit 6fc66a2.

Revert "copy libzstd over for trimming tests"

This reverts commit dc4c2dc.

vendor the old Zstd_jll

Author: IanButterworth

test/trimming/Project.toml

@@ -1,3 +1,6 @@
 [deps]
 JLLWrappers = "692b3bcd-3c85-4b1f-b108-f13ce0eb3210"
 Zstd_jll = "3161d3a3-bdf6-5164-811a-617609db77b4"
+
+[sources]
+Zstd_jll = {path = "Zstd_jll"}

test/trimming/Zstd_jll/Project.toml

@@ -0,0 +1,15 @@
+name = "Zstd_jll"
+uuid = "3161d3a3-bdf6-5164-811a-617609db77b4"
+version = "1.5.7+1"
+
+[deps]
+Libdl = "8f399da3-3557-5675-b5ff-fb832c97cbdb"
+
+[compat]
+julia = "1.6"
+
+[extras]
+Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
+
+[targets]
+test = ["Test"]

test/trimming/Zstd_jll/src/Zstd_jll.jl

@@ -0,0 +1,73 @@
+# This file is a part of Julia. License is MIT: https://julialang.org/license
+
+## dummy stub for https://github.com/JuliaBinaryWrappers/Zstd_jll.j:
+#
+baremodule Zstd_jll
+using Base, Libdl
+
+export libzstd, zstd, zstdmt
+
+# These get calculated in __init__()
+libzstd_handle::Ptr{Cvoid} = C_NULL
+
+if Sys.iswindows()
+    const libzstd = "libzstd-1.dll"
+elseif Sys.isapple()
+    const libzstd = "@rpath/libzstd.1.dylib"
+else
+    const libzstd = "libzstd.so.1"
+end
+
+if Sys.iswindows()
+    const zstd_exe = "zstd.exe"
+    const zstdmt_exe = "zstdmt.exe"
+else
+    const zstd_exe = "zstd"
+    const zstdmt_exe = "zstdmt"
+end
+
+if Sys.iswindows()
+    const pathsep = ';'
+elseif Sys.isapple()
+    const pathsep = ':'
+else
+    const pathsep = ':'
+end
+
+if Sys.iswindows()
+function adjust_ENV(cmd::Cmd)
+    dllPATH = Sys.BINDIR
+    oldPATH = get(ENV, "PATH", "")
+    newPATH = isempty(oldPATH) ? dllPATH : "$dllPATH$pathsep$oldPATH"
+    return addenv(cmd, "PATH"=>newPATH)
+end
+else
+adjust_ENV(cmd::Cmd) = cmd
+end
+
+function adjust_ENV()
+    addPATH = joinpath(Sys.BINDIR, Base.PRIVATE_LIBEXECDIR)
+    oldPATH = get(ENV, "PATH", "")
+    newPATH = isempty(oldPATH) ? addPATH : "$addPATH$pathsep$oldPATH"
+    return ("PATH"=>newPATH,)
+end
+
+function zstd(f::Function; adjust_PATH::Bool = true, adjust_LIBPATH::Bool = true) # deprecated, for compat only
+    withenv((adjust_PATH ? adjust_ENV() : ())...) do
+        f(zstd())
+    end
+end
+function zstdmt(f::Function; adjust_PATH::Bool = true, adjust_LIBPATH::Bool = true) # deprecated, for compat only
+    withenv((adjust_PATH ? adjust_ENV() : ())...) do
+        f(zstdmt())
+    end
+end
+zstd() = adjust_ENV(`$(joinpath(Sys.BINDIR, Base.PRIVATE_LIBEXECDIR, zstd_exe))`)
+zstdmt() = adjust_ENV(`$(joinpath(Sys.BINDIR, Base.PRIVATE_LIBEXECDIR, zstdmt_exe))`)
+
+function __init__()
+    global libzstd_handle = dlopen(libzstd)
+    nothing
+end
+
+end  # module Zstd_jll

test/trimming/Zstd_jll/test/runtests.jl

@@ -0,0 +1,7 @@
+# This file is a part of Julia. License is MIT: https://julialang.org/license
+
+using Test, Zstd_jll
+
+@testset "Zstd_jll" begin
+    @test ccall((:ZSTD_versionNumber, libzstd), Cuint, ()) == 1_05_07
+end

test/trimming/basic_jll.jl

@@ -1,9 +1,9 @@
 using Libdl
-using Zstd_jll
+using Zstd_jll # Note this uses the vendored older non-LazyLibrary version of Zstd_jll
 
 function @main(args::Vector{String})::Cint
     println(Core.stdout, "Julia! Hello, world!")
-    fptr = dlsym(Zstd_jll.libzstd, :ZSTD_versionString)
+    fptr = dlsym(Zstd_jll.libzstd_handle, :ZSTD_versionString)
     println(Core.stdout, unsafe_string(ccall(fptr, Cstring, ())))
     println(Core.stdout, unsafe_string(ccall((:ZSTD_versionString, libzstd), Cstring, ())))
     return 0