From f396286006358925249429764ac4790d58af42da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20H=C3=B8egh?= Date: Thu, 22 Oct 2015 22:40:28 +0200 Subject: [PATCH] Fix, test --- test/file.jl | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/test/file.jl b/test/file.jl index 4ea247d5a3e31..a9c17d0433239 100644 --- a/test/file.jl +++ b/test/file.jl @@ -859,16 +859,16 @@ end # walkdir # ################### -walkdir = mktempdir() -cd(dir) do +dirwalk = mktempdir() +cd(dirwalk) do for i=1:2 mkdir("sub_dir$i") open("file$i", "w") do f end mkdir(joinpath("sub_dir1", "subsub_dir$i")) - open(joinpath("sub_dir1", "file$i"), "w") do f end + touch(joinpath("sub_dir1", "file$i")) end - open(joinpath("sub_dir2", "file_dir2"), "w") + touch(joinpath("sub_dir2", "file_dir2")) has_symlinks = @unix? true : (Base.windows_version() >= Base.WINDOWS_VISTA_VER) follow_symlink_vec = has_symlinks ? [true, false] : [false] has_symlinks && symlink(abspath("sub_dir2"), joinpath("sub_dir1", "link")) @@ -954,7 +954,7 @@ cd(dir) do @test files == ["file_dir2"] end -@unix_only rm(walkdir, recursive=true) +rm(dirwalk, recursive=true) ############ # Clean up #