Skip to content

Commit

Permalink
Fix, test
Browse files Browse the repository at this point in the history
  • Loading branch information
dhoegh authored and dhoegh committed Oct 23, 2015
1 parent a9780eb commit f396286
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions test/file.jl
Original file line number Diff line number Diff line change
Expand Up @@ -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"))
Expand Down Expand Up @@ -954,7 +954,7 @@ cd(dir) do
@test files == ["file_dir2"]

end
@unix_only rm(walkdir, recursive=true)
rm(dirwalk, recursive=true)

############
# Clean up #
Expand Down

0 comments on commit f396286

Please sign in to comment.