Keep DLLs in the same folder and adapt tests

Author: Liozou

base/file.jl

@@ -330,13 +330,7 @@ function delayed_delete_dll(path)
     drive = first(splitdrive(path))
     tmpdrive = first(splitdrive(tempdir()))
     # in-use DLL must be kept on the same drive
-    deletedir = if drive == tmpdrive
-        joinpath(tempdir(), "julia_delayed_deletes")
-    else
-        joinpath(drive, "julia_delayed_deletes")
-    end
-    mkpath(deletedir)
-    temp_path = tempname(deletedir; cleanup=false, suffix=string("_", basename(path)))
+    temp_path = tempname(abspath(dirname(path)); cleanup=false, suffix=string("_", basename(path)))
     @debug "Could not delete DLL most likely because it is loaded, moving to a temporary path" path temp_path
     mkpath(delayed_delete_ref())
     io = last(mktemp(delayed_delete_ref(); cleanup=false))

test/loading.jl

@@ -227,6 +227,49 @@ end
 end
 
 
+# Setup to rm a depot. On Windows, this needs to be delayed as in-use DLLs cannot be removed.
+if Sys.iswindows()
+    const DEPOTS_TOREMOVE = String[]
+    atexit() do # launch a process that will rm the depots
+        rmcmd = """
+        for _ in 1:3600 # wait up to 1h from atexit() until the julia testing process dies
+            sleep(1)
+            ccall(:uv_kill, Cint, (Cuint, Cint), $(getpid()), 0) == Base.UV_ESRCH && break
+        end
+        for path in $DEPOTS_TOREMOVE
+            try
+                rm(path, force=true, recursive=true)
+            catch
+            end
+        end
+        """
+        cmd = Cmd(`$(Base.julia_cmd()) --startup-file=no -e $rmcmd`; ignorestatus=true, detach=true)
+        run(cmd; wait=false)
+    end
+end
+function rmdepot(depot)
+    try
+        @static if Sys.iswindows()
+            push!(DEPOTS_TOREMOVE, depot)
+        else
+            rm(depot, force=true, recursive=true)
+        end
+    catch err
+        @show err
+    end
+end
+
+function mkdepottempdir(f::Function, parent=tempdir(); prefix="jltestdepot_")
+    tmpdir = mktempdir(parent; prefix, cleanup=false)
+    try
+        f(tmpdir)
+    finally
+        rmdepot(tmpdir)
+    end
+end
+mkdepottempdir(parent=tempdir(); prefix="jltestdepot_") = mktempdir(parent; prefix, cleanup=!Sys.iswindows())
+
+
 ## functional testing of package identification, location & loading ##
 
 saved_load_path = copy(LOAD_PATH)
@@ -237,7 +280,8 @@ push!(Base.active_project_callbacks, () -> watcher_counter[] += 1)
 push!(Base.active_project_callbacks, () -> error("broken"))
 
 push!(empty!(LOAD_PATH), joinpath(@__DIR__, "project"))
-append!(empty!(DEPOT_PATH), [mktempdir(), joinpath(@__DIR__, "depot")])
+const testdefaultdepot = mkdepottempdir()
+append!(empty!(DEPOT_PATH), [testdefaultdepot, joinpath(@__DIR__, "depot")])
 @test watcher_counter[] == 0
 @test_logs (:error, r"active project callback .* failed") Base.set_active_project(nothing)
 @test watcher_counter[] == 1
@@ -374,6 +418,8 @@ module NotPkgModule; end
 
 end
 
+rmdepot(testdefaultdepot)
+
 ## systematic generation of test environments ##
 
 const M = 3 # number of node names
@@ -461,7 +507,7 @@ function make_env(flat, root, roots, graph, paths, dummies)
     )
 end
 
-const depots = [mktempdir() for _ = 1:3]
+const depots = [mkdepottempdir() for _ = 1:3]
 const envs = Dict{String,Any}()
 
 append!(empty!(DEPOT_PATH), depots)
@@ -756,11 +802,7 @@ for env in keys(envs)
     rm(env, force=true, recursive=true)
 end
 for depot in depots
-    try
-        rm(depot, force=true, recursive=true)
-    catch err
-        @show err
-    end
+    rmdepot(depot)
 end
 
 append!(empty!(LOAD_PATH), saved_load_path)
@@ -1043,7 +1085,7 @@ end
         _pkgversion == pkgversion(parent) || error("unexpected extension \$ext version: \$_pkgversion")
     end
     """
-    depot_path = mktempdir()
+    depot_path = mkdepottempdir()
     try
         proj = joinpath(@__DIR__, "project", "Extensions", "HasDepWithExtensions.jl")
 
@@ -1155,7 +1197,7 @@ end
 
         # Extension-to-extension dependencies
 
-        mktempdir() do depot # Parallel pre-compilation
+        mkdepottempdir() do depot # Parallel pre-compilation
             code = """
             Base.disable_parallel_precompile = false
             using ExtToExtDependency
@@ -1171,7 +1213,7 @@ end
             )
             @test occursin("Hello ext-to-ext!", String(read(cmd)))
         end
-        mktempdir() do depot # Serial pre-compilation
+        mkdepottempdir() do depot # Serial pre-compilation
             code = """
             Base.disable_parallel_precompile = true
             using ExtToExtDependency
@@ -1188,7 +1230,7 @@ end
             @test occursin("Hello ext-to-ext!", String(read(cmd)))
         end
 
-        mktempdir() do depot # Parallel pre-compilation
+        mkdepottempdir() do depot # Parallel pre-compilation
             code = """
             Base.disable_parallel_precompile = false
             using CrossPackageExtToExtDependency
@@ -1204,7 +1246,7 @@ end
             )
             @test occursin("Hello x-package ext-to-ext!", String(read(cmd)))
         end
-        mktempdir() do depot # Serial pre-compilation
+        mkdepottempdir() do depot # Serial pre-compilation
             code = """
             Base.disable_parallel_precompile = true
             using CrossPackageExtToExtDependency
@@ -1224,7 +1266,7 @@ end
         # Extensions for "parent" dependencies
         # (i.e. an `ExtAB`  where A depends on / loads B, but B provides the extension)
 
-        mktempdir() do depot # Parallel pre-compilation
+        mkdepottempdir() do depot # Parallel pre-compilation
             code = """
             Base.disable_parallel_precompile = false
             using Parent
@@ -1239,7 +1281,7 @@ end
             )
             @test occursin("Hello parent!", String(read(cmd)))
         end
-        mktempdir() do depot # Serial pre-compilation
+        mkdepottempdir() do depot # Serial pre-compilation
             code = """
             Base.disable_parallel_precompile = true
             using Parent
@@ -1256,11 +1298,7 @@ end
         end
 
     finally
-        try
-            rm(depot_path, force=true, recursive=true)
-        catch err
-            @show err
-        end
+        rmdepot(depot_path)
     end
 end
 
@@ -1364,7 +1402,7 @@ end
 end
 
 @testset "relocatable upgrades #51989" begin
-    mktempdir() do depot
+    mkdepottempdir() do depot
         # realpath is needed because Pkg is used for one of the precompile paths below, and Pkg calls realpath on the
         # project path so the cache file slug will be different if the tempdir is given as a symlink
         # (which it often is on MacOS) which would break the test.
@@ -1438,7 +1476,7 @@ end
 end
 
 @testset "code coverage disabled during precompilation" begin
-    mktempdir() do depot
+    mkdepottempdir() do depot
         cov_test_dir = joinpath(@__DIR__, "project", "deps", "CovTest.jl")
         cov_cache_dir = joinpath(depot, "compiled", "v$(VERSION.major).$(VERSION.minor)", "CovTest")
         function rm_cov_files()
@@ -1482,7 +1520,7 @@ end
 end
 
 @testset "command-line flags" begin
-    mktempdir() do depot_path mktempdir() do dir
+    mkdepottempdir() do depot_path mktempdir() do dir
         # generate a Parent.jl and Child.jl package, with Parent depending on Child
         open(joinpath(dir, "Child.jl"), "w") do io
             println(io, """
@@ -1565,7 +1603,7 @@ end
 end
 
 @testset "including non-existent file throws proper error #52462" begin
-    mktempdir() do depot
+    mkdepottempdir() do depot
         project_path = joinpath(depot, "project")
         mkpath(project_path)
 
@@ -1707,7 +1745,7 @@ end
 end
 
 @testset "require_stdlib loading duplication" begin
-    depot_path = mktempdir()
+    depot_path = mkdepottempdir()
     oldBase64 = nothing
     try
         push!(empty!(DEPOT_PATH), depot_path)
@@ -1731,7 +1769,7 @@ end
     finally
         oldBase64 === nothing || Base.register_root_module(oldBase64)
         copy!(DEPOT_PATH, original_depot_path)
-        rm(depot_path, force=true, recursive=true)
+        rmdepot(depot_path)
     end
 end