Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
version:
- '1.8'
- '1.10'
- '~1.12.0-rc1'
- '1.12'
os:
- ubuntu-latest
- macOS-latest
Expand Down
2 changes: 1 addition & 1 deletion Project.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name = "ReTestItems"
uuid = "817f1d60-ba6b-4fd5-9520-3cf149f6a823"
version = "1.35.1"
version = "1.35.2"

[deps]
Dates = "ade2ca70-3891-5945-98fb-dc099432e06a"
Expand Down
9 changes: 8 additions & 1 deletion src/workers.jl
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,14 @@ function terminate!(w::Worker, from::Symbol=:manual)
end
signal = Base.SIGTERM
while true
kill(w.process, signal)
try
kill(w.process, signal)
catch e
# Windows: TerminateProcess on a process that is currently exiting
# fails with ERROR_ACCESS_DENIED before the process object is
# signaled; libuv surfaces that as EACCES instead of ESRCH.
(Sys.iswindows() && e isa Base.IOError && e.code == Base.UV_EACCES) || rethrow()
end
signal = signal == Base.SIGTERM ? Base.SIGINT : Base.SIGKILL
process_exited(w.process) && break
sleep(0.1)
Expand Down
1 change: 1 addition & 0 deletions test/junit_xml.jl
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ function test_reference(reference, comparison)
end
a = remove_variables(read(reference, String))
b = remove_variables(read(comparison, String))
b = VERSION >= v"1.12" ? replace(b, r" *Suggestion: check for spelling errors or missing imports. *\n" => "") : b
if a == b
@test true
return nothing
Expand Down
Loading