Adjust slashes, fix tests

JuliaLang · Apr 17, 2020 · 104afe3 · 104afe3
1 parent d29f785
commit 104afe3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/base/Base.jl b/base/Base.jl
@@ -162,8 +162,8 @@ include("strings/string.jl")
 include("strings/substring.jl")
 
 # For OS specific stuff
-include(string((length(Core.ARGS)>=2 ? Core.ARGS[2] : ""), "build_h.jl")) # include($BUILDROOT/base/build_h.jl)
-include(string((length(Core.ARGS)>=2 ? Core.ARGS[2] : ""), "version_git.jl")) # include($BUILDROOT/base/version_git.jl)
+include(string((length(Core.ARGS)>=2 ? Core.ARGS[2] : ""), "/build_h.jl")) # include($BUILDROOT/base/build_h.jl)
+include(string((length(Core.ARGS)>=2 ? Core.ARGS[2] : ""), "/version_git.jl")) # include($BUILDROOT/base/version_git.jl)
 
 # Initialize DL_LOAD_PATH as early as possible. We are defining things here in
 # a slightly more verbose fashion than usual, because we're running so early.

diff --git a/test/precompile.jl b/test/precompile.jl
@@ -258,6 +258,7 @@ try
  @test_throws ErrorException Base.read_dependency_src(cachefile, joinpath(dir, "foo.jl"))
 
  modules, deps1 = Base.cache_dependencies(cachefile)
+ stdlib_modules = filter(s -> Base.identify_package(s) !== nothing, readdir(Sys.STDLIB))
  @test Dict(modules) == merge(
  Dict(let m = Base.PkgId(s)
  m => Base.module_build_id(Base.root_module(m))
@@ -267,7 +268,7 @@ try
  # plus modules included in the system image
  Dict(let m = Base.root_module(Base, s)
  Base.PkgId(m) => Base.module_build_id(m)
- end for s in Symbol.(readdir(Sys.STDLIB))),
+ end for s in Symbol.(stdlib_modules)),
  # Plus precompilation module generated at build time
  let id = Base.PkgId("__PackagePrecompilationStatementModule")
  Dict(id => Base.module_build_id(Base.root_module(id)))