revert error msg in SystemError

JuliaLang · Jun 20, 2024 · 2c96a66 · 2c96a66
1 parent 5861922
commit 2c96a66
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/base/loading.jl b/base/loading.jl
@@ -2059,9 +2059,9 @@ function _include_dependency(mod::Module, _path::AbstractString; track_content=t
     end
     if !_track_dependencies[]
         if !path_may_be_dir && !isfile(path)
-            throw(SystemError("including file $(repr(path))", Libc.ENOENT))
+            throw(SystemError("opening file $(repr(path))", Libc.ENOENT))
         elseif path_may_be_dir && !Filesystem.isreadable(path)
-            throw(SystemError("including file or folder $(repr(path))", Libc.ENOENT))
+            throw(SystemError("opening file or folder $(repr(path))", Libc.ENOENT))
         end
     else
         @lock require_lock begin

diff --git a/test/loading.jl b/test/loading.jl
@@ -652,7 +652,7 @@ end
     exc = try; include("./notarealfile.jl"); "unexpectedly reached!"; catch exc; exc; end
     @test exc isa SystemError
     exc.prefix
-end == "including file $(repr(joinpath(@__DIR__, "notarealfile.jl")))"
+end == "opening file $(repr(joinpath(@__DIR__, "notarealfile.jl")))"
 
 old_act_proj = Base.ACTIVE_PROJECT[]
 pushfirst!(LOAD_PATH, "@")
@@ -1549,7 +1549,7 @@ end
         end
 
         file = joinpath(depot, "dev", "non-existent.jl")
-        @test_throws SystemError("including file $(repr(file))") include(file)
+        @test_throws SystemError("opening file $(repr(file))") include(file)
         touch(file)
         @test include_dependency(file) === nothing
         chmod(file, 0x000)
@@ -1559,7 +1559,7 @@ end
             @test include_dependency(dir) === nothing
             dir
         end
-        @test_throws SystemError("including file or folder $(repr(dir))") include_dependency(dir)
+        @test_throws SystemError("opening file or folder $(repr(dir))") include_dependency(dir)
     end
 end
 

diff --git a/test/precompile.jl b/test/precompile.jl
@@ -2003,18 +2003,18 @@ end
 
 precompile_test_harness("Issue #52063") do load_path
     fname = joinpath(load_path, "i_do_not_exist.jl")
-    @test_throws ArgumentError("$(repr(fname)): No such file or directory") include_dependency(fname)
+    @test_throws SystemError("opening file or folder $(repr(fname))") include_dependency(fname)
     touch(fname)
     @test include_dependency(fname) === nothing
     chmod(fname, 0x000)
-    @test_throws ArgumentError("$(repr(fname)): Missing read permission") include_dependency(fname)
+    @test_throws SystemError("opening file or folder $(repr(fname))", Libc.ENOENT) include_dependency(fname)
     dir = mktempdir() do dir
         @test include_dependency(dir) === nothing
         chmod(dir, 0x000)
-        @test_throws ArgumentError("$(repr(dir)): Missing read permission") include_dependency(dir)
+        @test_throws SystemError("opening file or folder $(repr(dir))", Libc.ENOENT) include_dependency(dir)
         dir
     end
-    @test_throws ArgumentError("$(repr(dir)): No such file or directory") include_dependency(dir)
+    @test_throws SystemError("opening file or folder $(repr(dir))") include_dependency(dir)
 end
 
 finish_precompile_test!()