Skip to content

Commit b00fcb0

Browse files
committed
Merge pull request #16551 from JuliaLang/tk/tempfiles
Clean up temporary files from tests
2 parents c02f125 + 496a161 commit b00fcb0

File tree

5 files changed

+16
-9
lines changed

5 files changed

+16
-9
lines changed

test/compile.jl

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,6 @@ finally
127127
end
128128

129129
# test --compilecache=no command line option
130-
dir = mktempdir()
131130
let dir = mktempdir(),
132131
Time_module = :Time4b3a94a1a081a8cb
133132

test/core.jl

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2345,7 +2345,8 @@ end === nothing
23452345
# issue #10221
23462346
module GCbrokentype
23472347
OLD_STDOUT = STDOUT
2348-
file = open(tempname(), "w")
2348+
fname = tempname()
2349+
file = open(fname, "w")
23492350
redirect_stdout(file)
23502351
versioninfo()
23512352
try
@@ -2356,6 +2357,7 @@ end
23562357
gc()
23572358
redirect_stdout(OLD_STDOUT)
23582359
close(file)
2360+
rm(fname)
23592361
end
23602362

23612363
# issue #10373

test/file.jl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -289,6 +289,7 @@ my_tempdir = tempdir()
289289
path = tempname()
290290
# Issue #9053.
291291
@test ispath(path) == is_windows()
292+
ispath(path) && rm(path)
292293

293294
(p, f) = mktemp()
294295
print(f, "Here is some text")

test/parallel_exec.jl

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -331,12 +331,13 @@ check_pids_all(S)
331331
filedata = similar(Atrue)
332332
read!(fn, filedata)
333333
@test filedata == sdata(S)
334+
finalize(S)
334335

335336
# Error for write-only files
336337
@test_throws ArgumentError SharedArray(fn, Int, sz, mode="w")
337338

338339
# Error for file doesn't exist, but not allowed to create
339-
@test_throws ArgumentError SharedArray(tempname(), Int, sz, mode="r")
340+
@test_throws ArgumentError SharedArray(joinpath(tempdir(),randstring()), Int, sz, mode="r")
340341

341342
# Creating a new file
342343
fn2 = tempname()
@@ -345,6 +346,7 @@ S = SharedArray(fn2, Int, sz, init=D->D[localindexes(D)] = myid())
345346
filedata2 = similar(Atrue)
346347
read!(fn2, filedata2)
347348
@test filedata == filedata2
349+
finalize(S)
348350

349351
# Appending to a file
350352
fn3 = tempname()
@@ -356,11 +358,14 @@ filedata = Array(UInt8, len)
356358
read!(fn3, filedata)
357359
@test all(filedata[1:4] .== 0x01)
358360
@test all(filedata[5:end] .== 0x02)
359-
360-
if !is_windows()
361-
# these give unlink: operation not permitted (EPERM) on Windows
362-
rm(fn); rm(fn2); rm(fn3)
363-
end
361+
finalize(S)
362+
363+
# call gc 3 times to avoid unlink: operation not permitted (EPERM) on Windows
364+
S = nothing
365+
@everywhere gc()
366+
@everywhere gc()
367+
@everywhere gc()
368+
rm(fn); rm(fn2); rm(fn3)
364369

365370
### Utility functions
366371

test/replcompletions.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -636,7 +636,7 @@ if is_windows()
636636
s = "cd(\"$(file[1:2])"
637637
c,r = test_complete(s)
638638
@test r == length(s) - 1:length(s)
639-
@test file in c
639+
@test (length(c) > 1 && file in c) || (["$file\""] == c)
640640
end
641641
rm(tmp)
642642
end

0 commit comments

Comments
 (0)