move out Test from the sysimage

JuliaLang · Mar 24, 2023 · d862639 · d862639
1 parent d7df15d
commit d862639
Show file tree

Hide file tree

Showing 6 changed files with 34 additions and 35 deletions.
diff --git a/base/sysimg.jl b/base/sysimg.jl
@@ -66,7 +66,6 @@ let
  :REPL,
  :SharedArrays,
  :TOML,
- :Test,
 
  # 4-depth packages
  :LibCURL,

diff --git a/contrib/cache_stdlibs.jl b/contrib/cache_stdlibs.jl
@@ -22,6 +22,7 @@ stdlibs = [
 
  # 3-depth packages
  :LibGit2_jll,
+ :Test,
 
  # 4-depth packages
  :SparseArrays,

diff --git a/contrib/generate_precompile.jl b/contrib/generate_precompile.jl
@@ -199,39 +199,6 @@ if Libdl !== nothing
  """
 end
 
-Test = get(Base.loaded_modules,
- Base.PkgId(Base.UUID("8dfed614-e22c-5e08-85e1-65c5234f0b40"), "Test"),
- nothing)
-if Test !== nothing
- hardcoded_precompile_statements *= """
- precompile(Tuple{typeof(Test.do_test), Test.ExecutionResult, Any})
- precompile(Tuple{typeof(Test.testset_beginend_call), Tuple{String, Expr}, Expr, LineNumberNode})
- precompile(Tuple{Type{Test.DefaultTestSet}, String})
- precompile(Tuple{Type{Test.DefaultTestSet}, AbstractString})
- precompile(Tuple{Core.kwftype(Type{Test.DefaultTestSet}), Any, Type{Test.DefaultTestSet}, AbstractString})
- precompile(Tuple{typeof(Test.finish), Test.DefaultTestSet})
- precompile(Tuple{typeof(Test.eval_test), Expr, Expr, LineNumberNode, Bool})
- precompile(Tuple{typeof(Test._inferred), Expr, Module})
- precompile(Tuple{typeof(Test.push_testset), Test.DefaultTestSet})
- precompile(Tuple{typeof(Test.get_alignment), Test.DefaultTestSet, Int})
- precompile(Tuple{typeof(Test.get_test_result), Any, Any})
- precompile(Tuple{typeof(Test.do_test_throws), Test.ExecutionResult, Any, Any})
- precompile(Tuple{typeof(Test.print_counts), Test.DefaultTestSet, Int, Int, Int, Int, Int, Int, Int})
- precompile(Tuple{typeof(Test._check_testset), Type, Expr})
- precompile(Tuple{typeof(Test.test_expr!), Any, Any})
- precompile(Tuple{typeof(Test.test_expr!), Any, Any, Vararg{Any, 100}})
- precompile(Tuple{typeof(Test.pop_testset)})
- precompile(Tuple{typeof(Test.match_logs), Function, Tuple{Symbol, Regex}})
- precompile(Tuple{typeof(Test.match_logs), Function, Tuple{String, Regex}})
- precompile(Tuple{typeof(Base.CoreLogging.shouldlog), Test.TestLogger, Base.CoreLogging.LogLevel, Module, Symbol, Symbol})
- precompile(Tuple{typeof(Base.CoreLogging.handle_message), Test.TestLogger, Base.CoreLogging.LogLevel, String, Module, Symbol, Symbol, String, Int})
- precompile(Tuple{typeof(Test.detect_ambiguities), Any})
- precompile(Tuple{typeof(Test.collect_test_logs), Function})
- precompile(Tuple{typeof(Test.do_broken_test), Test.ExecutionResult, Any})
- precompile(Tuple{typeof(Test.record), Test.DefaultTestSet, Union{Test.Error, Test.Fail}})
- precompile(Tuple{typeof(Test.filter_errors), Test.DefaultTestSet})
- """
-end
 
 Profile = get(Base.loaded_modules,
  Base.PkgId(Base.UUID("9abbd945-dff8-562f-b5e8-e1ebf5ef1b79"), "Profile"),

diff --git a/stdlib/Test/src/Test.jl b/stdlib/Test/src/Test.jl
@@ -2096,5 +2096,6 @@ function _check_bitarray_consistency(B::BitArray{N}) where N
 end
 
 include("logging.jl")
+include("precompile.jl")
 
 end # module
diff --git a/stdlib/Test/src/precompile.jl b/stdlib/Test/src/precompile.jl
@@ -0,0 +1,31 @@
+precompile(Tuple{typeof(Test.do_test), Test.ExecutionResult, Any})
+precompile(Tuple{typeof(Test.testset_beginend_call), Tuple{String, Expr}, Expr, LineNumberNode})
+precompile(Tuple{Type{Test.DefaultTestSet}, String})
+precompile(Tuple{Type{Test.DefaultTestSet}, AbstractString})
+precompile(Tuple{Core.kwftype(Type{Test.DefaultTestSet}), Any, Type{Test.DefaultTestSet}, AbstractString})
+precompile(Tuple{typeof(Test.finish), Test.DefaultTestSet})
+precompile(Tuple{typeof(Test.eval_test), Expr, Expr, LineNumberNode, Bool})
+precompile(Tuple{typeof(Test._inferred), Expr, Module})
+precompile(Tuple{typeof(Test.push_testset), Test.DefaultTestSet})
+precompile(Tuple{typeof(Test.get_alignment), Test.DefaultTestSet, Int})
+precompile(Tuple{typeof(Test.get_test_result), Any, Any})
+precompile(Tuple{typeof(Test.do_test_throws), Test.ExecutionResult, Any, Any})
+precompile(Tuple{typeof(Test.print_counts), Test.DefaultTestSet, Int, Int, Int, Int, Int, Int, Int})
+precompile(Tuple{typeof(Test._check_testset), Type, Expr})
+precompile(Tuple{typeof(Test.test_expr!), Any, Any})
+precompile(Tuple{typeof(Test.test_expr!), Any, Any, Vararg{Any, 100}})
+precompile(Tuple{typeof(Test.pop_testset)})
+precompile(Tuple{typeof(Test.match_logs), Function, Tuple{Symbol, Regex}})
+precompile(Tuple{typeof(Test.match_logs), Function, Tuple{String, Regex}})
+precompile(Tuple{typeof(Base.CoreLogging.shouldlog), Test.TestLogger, Base.CoreLogging.LogLevel, Module, Symbol, Symbol})
+precompile(Tuple{typeof(Base.CoreLogging.handle_message), Test.TestLogger, Base.CoreLogging.LogLevel, String, Module, Symbol, Symbol, String, Int})
+precompile(Tuple{typeof(Test.detect_ambiguities), Any})
+precompile(Tuple{typeof(Test.collect_test_logs), Function})
+precompile(Tuple{typeof(Test.do_broken_test), Test.ExecutionResult, Any})
+precompile(Tuple{typeof(Test.record), Test.DefaultTestSet, Union{Test.Error, Test.Fail}})
+precompile(Tuple{typeof(Test.filter_errors), Test.DefaultTestSet})
+# TODO: Check which of the explicit precompile statments above are still needed
+# with the workload below active.
+@testset "example" begin
+ @test 1 == 1
+end
diff --git a/test/precompile.jl b/test/precompile.jl
@@ -399,7 +399,7 @@ precompile_test_harness(false) do dir
  :LazyArtifacts, :LibCURL, :LibCURL_jll, :LibGit2, :Libdl, :LinearAlgebra,
  :Logging, :Markdown, :Mmap, :MozillaCACerts_jll, :NetworkOptions, :OpenBLAS_jll, :Pkg, :Printf,
  :Profile, :p7zip_jll, :REPL, :Random, :SHA, :Serialization, :SharedArrays, :Sockets,
- :TOML, :Tar, :Test, :UUIDs, :Unicode,
+ :Test, :TOML, :Tar, :UUIDs, :Unicode,
  :nghttp2_jll]
  ),
  )