Use jlutilities mechanism for external package required in test (#60232)

Author: Keno

Compiler/extras/CompilerDevTools/test/testpkg.jl

@@ -1,6 +1,5 @@
 using Pkg
 
 Pkg.activate(dirname(@__DIR__)) do
-  Pkg.instantiate()
   include("runtests.jl")
 end

JuliaLowering/.gitignore

@@ -1 +0,0 @@
-/Manifest.toml

JuliaLowering/Manifest.toml

@@ -0,0 +1,16 @@
+# This file is machine-generated - editing it directly is not advised
+
+julia_version = "1.14.0-DEV"
+manifest_format = "2.1"
+project_hash = "16f6f8d58c46fe20d68a941bfaddb4590471548a"
+
+[[deps.JuliaLowering]]
+deps = ["JuliaSyntax"]
+path = "."
+uuid = "f3c80556-a63f-4383-b822-37d64f81a311"
+version = "1.0.0-DEV"
+
+[[deps.JuliaSyntax]]
+path = "../JuliaSyntax"
+uuid = "70703baa-626e-46a2-a12c-08ffd08c73b4"
+version = "2.0.0-DEV"

JuliaLowering/test/runtests_vendored.jl

@@ -3,12 +3,6 @@ try
     # test local (dev) copy of JuliaLowering, not yet vendored into Base
     Base.set_active_project(joinpath(@__DIR__, "..", "Project.toml"))
     manifest_path = joinpath(@__DIR__, "..", "Manifest.toml")
-    isfile(manifest_path) && rm(manifest_path)
-
-    # activate and instantiate JuliaSyntax as a local package (rather than using
-    # Base.JuliaSyntax)
-    import Pkg
-    Pkg.instantiate()
 
     # restore error hints (emptied by `testdefs.jl`) so that errors print as
     # JuliaLowering expects them to

deps/jlutilities/objectfile/Manifest.toml

@@ -0,0 +1,28 @@
+# This file is machine-generated - editing it directly is not advised
+
+julia_version = "1.14.0-DEV"
+manifest_format = "2.1"
+project_hash = "23b8253b8eadb7ba5d7489bb56f38819b7150654"
+
+[[deps.ObjectFile]]
+deps = ["Reexport", "StructIO"]
+git-tree-sha1 = "22faba70c22d2f03e60fbc61da99c4ebfc3eb9ba"
+registries = "General"
+uuid = "d8793406-e978-5875-9003-1fc021f44a92"
+version = "0.5.0"
+
+[[deps.Reexport]]
+git-tree-sha1 = "45e428421666073eab6f2da5c9d310d99bb12f9b"
+registries = "General"
+uuid = "189a3867-3050-52da-a836-e630ba90ab69"
+version = "1.2.2"
+
+[[deps.StructIO]]
+git-tree-sha1 = "c581be48ae1cbf83e899b14c07a807e1787512cc"
+registries = "General"
+uuid = "53d494c1-5632-5724-8f4c-31dff12d585f"
+version = "0.3.1"
+
+[registries.General]
+url = "https://github.com/JuliaRegistries/General.git"
+uuid = "23338594-aafe-5451-b93e-139f81909106"

deps/jlutilities/objectfile/Project.toml

@@ -0,0 +1,2 @@
+[deps]
+ObjectFile = "d8793406-e978-5875-9003-1fc021f44a92"

test/runtests.jl

@@ -28,6 +28,7 @@ end
 
 const rmwait_timeout = running_under_rr() ? 300 : 30
 
+ENV["JULIA_TEST_BUILDROOT"] = buildroot
 if use_revise
     # First put this at the top of the DEPOT PATH to install revise if necessary.
     # Once it's loaded, we swizzle it to the end, to avoid confusing any tests.

test/stdlib_dependencies.jl

@@ -1,14 +1,37 @@
 # This file is a part of Julia. License is MIT: https://julialang.org/license
 
 using Libdl
-using Pkg
 using Test
-prev_env = Base.active_project()
-Pkg.activate(temp=true)
-Pkg.add(Pkg.PackageSpec(name="ObjectFile", uuid="d8793406-e978-5875-9003-1fc021f44a92", version="0.4"))
-using ObjectFile
-try
 
+# Load ObjectFile.jl from the vendored jlutilities depot
+buildroot = get(ENV, "JULIA_TEST_BUILDROOT", joinpath(@__DIR__, ".."))
+depspath = joinpath(buildroot, "deps", "jlutilities")
+if ispath(depspath)
+    depspath = realpath(depspath)
+    # With a source-tree use the vendored depot
+    pushfirst!(DEPOT_PATH, joinpath(depspath, "depot"))
+    using Pkg
+    old_active_project = Base.active_project()
+    Base.redirect_stdout(devnull) do
+        Base.redirect_stderr(devnull) do
+            Pkg.activate(realpath(joinpath(@__DIR__, "..", "deps", "jlutilities", "objectfile")))
+            Pkg.instantiate()
+        end
+    end
+    using ObjectFile
+    popfirst!(DEPOT_PATH)
+    Base.set_active_project(old_active_project)
+else
+    # Without a source-tree - expect that the user has installed it for us - warn otherwise
+    ObjectFile_pkgid = Base.PkgId(Base.UUID("d8793406-e978-5875-9003-1fc021f44a92"), "ObjectFile")
+    if Base.locate_package(ObjectFile_pkgid) !== nothing
+        @eval using ObjectFile
+    end
+end
+
+if !@isdefined(ObjectFile)
+    @warn("ObjectFile.jl not available; skipping stdlib JLL dependency tests")
+else
     strip_soversion(lib::AbstractString) = Base.BinaryPlatforms.parse_dl_name_version(lib)[1]
 
     function get_deps_objectfile_macos(lib_path::String)
@@ -249,8 +272,8 @@ try
 
                     # This is a manually-managed special case
                     if stdlib_name == "libblastrampoline_jll" &&
-                       prop_name == :libblastrampoline &&
-                       extraneous_deps in (["libopenblas64_"], ["libopenblas"])
+                        prop_name == :libblastrampoline &&
+                        extraneous_deps in (["libopenblas64_"], ["libopenblas"])
                         deps_mismatch = false
                     end
 
@@ -315,12 +338,4 @@ try
             end
         end
     end
-
-finally
-    if prev_env !== nothing
-        Pkg.activate(prev_env)
-    else
-        # If no previous environment, activate the default one
-        Pkg.activate()
-    end
 end