make choosetests find the test files for devved stdlibs

JuliaLang · Nov 14, 2024 · 2aaa8ef · 2aaa8ef
1 parent aa05c98
commit 2aaa8ef
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/base/util.jl b/base/util.jl
@@ -707,7 +707,7 @@ function runtests(tests = ["all"]; ncores::Int = ceil(Int, Sys.CPU_THREADS / 2),
     ENV2["JULIA_TESTS"] = "true"
     delete!(ENV2, "JULIA_PROJECT")
     try
-        run(setenv(`$(julia_cmd()) $(joinpath(Sys.BINDIR,
+        run(setenv(`$(julia_cmd()) --project=$(Base.active_project()) $(joinpath(Sys.BINDIR,
             Base.DATAROOTDIR, "julia", "test", "runtests.jl")) $tests`, ENV2))
         nothing
     catch

diff --git a/test/choosetests.jl b/test/choosetests.jl
@@ -48,10 +48,11 @@ const NETWORK_REQUIRED_LIST = vcat(INTERNET_REQUIRED_LIST, ["Sockets"])
 function test_path(test)
     t = split(test, '/')
     if t[1] in STDLIBS
+        pkgdir = abspath(Base.find_package(String(t[1])), "..", "..")
         if length(t) == 2
-            return joinpath(STDLIB_DIR, t[1], "test", t[2])
+            return joinpath(pkgdir, "test", t[2])
         else
-            return joinpath(STDLIB_DIR, t[1], "test", "runtests")
+            return joinpath(pkgdir, "test", "runtests")
         end
     elseif t[1] == "Compiler"
         testpath = length(t) >= 2 ? t[2:end] : ("runtests",)