Skip to content

Commit 28d4c59

Browse files
committed
only check error msg contained in thrown SystemError
1 parent 2c96a66 commit 28d4c59

File tree

2 files changed

+44
-6
lines changed

2 files changed

+44
-6
lines changed

test/loading.jl

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1549,7 +1549,13 @@ end
15491549
end
15501550

15511551
file = joinpath(depot, "dev", "non-existent.jl")
1552-
@test_throws SystemError("opening file $(repr(file))") include(file)
1552+
@test try
1553+
include(file); false
1554+
catch e
1555+
@test e isa SystemError
1556+
@test e.prefix == "opening file $(repr(file))"
1557+
true
1558+
end
15531559
touch(file)
15541560
@test include_dependency(file) === nothing
15551561
chmod(file, 0x000)
@@ -1559,7 +1565,13 @@ end
15591565
@test include_dependency(dir) === nothing
15601566
dir
15611567
end
1562-
@test_throws SystemError("opening file or folder $(repr(dir))") include_dependency(dir)
1568+
@test try
1569+
include_dependency(dir); false
1570+
catch e
1571+
@test e isa SystemError
1572+
@test e.prefix == "opening file or folder $(repr(dir))"
1573+
true
1574+
end
15631575
end
15641576
end
15651577

test/precompile.jl

Lines changed: 30 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2003,18 +2003,44 @@ end
20032003

20042004
precompile_test_harness("Issue #52063") do load_path
20052005
fname = joinpath(load_path, "i_do_not_exist.jl")
2006-
@test_throws SystemError("opening file or folder $(repr(fname))") include_dependency(fname)
2006+
@test try
2007+
include_dependency(fname); false
2008+
catch e
2009+
@test e isa SystemError
2010+
@test e.prefix == "opening file or folder $(repr(fname))"
2011+
true
2012+
end
20072013
touch(fname)
20082014
@test include_dependency(fname) === nothing
20092015
chmod(fname, 0x000)
2010-
@test_throws SystemError("opening file or folder $(repr(fname))", Libc.ENOENT) include_dependency(fname)
2016+
@test try
2017+
include_dependency(fname); false
2018+
catch e
2019+
@test e isa SystemError
2020+
@test e.prefix == "opening file or folder $(repr(fname))"
2021+
true
2022+
end
20112023
dir = mktempdir() do dir
20122024
@test include_dependency(dir) === nothing
20132025
chmod(dir, 0x000)
2014-
@test_throws SystemError("opening file or folder $(repr(dir))", Libc.ENOENT) include_dependency(dir)
2026+
if !iswindows()
2027+
@test try
2028+
include_dependency(dir); false
2029+
catch e
2030+
@test e isa SystemError
2031+
@test e.prefix == "opening file or folder $(repr(dir))"
2032+
true
2033+
end
2034+
end
20152035
dir
20162036
end
2017-
@test_throws SystemError("opening file or folder $(repr(dir))") include_dependency(dir)
2037+
@test try
2038+
include_dependency(dir); false
2039+
catch e
2040+
@test e isa SystemError
2041+
@test e.prefix == "opening file or folder $(repr(dir))"
2042+
true
2043+
end
20182044
end
20192045

20202046
finish_precompile_test!()

0 commit comments

Comments
 (0)