Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit f396286

Browse files
dhoeghdhoegh
authored and
dhoegh
committedOct 23, 2015
Fix, test
1 parent a9780eb commit f396286

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed
 

‎test/file.jl

+5-5
Original file line numberDiff line numberDiff line change
@@ -859,16 +859,16 @@ end
859859
# walkdir #
860860
###################
861861

862-
walkdir = mktempdir()
863-
cd(dir) do
862+
dirwalk = mktempdir()
863+
cd(dirwalk) do
864864
for i=1:2
865865
mkdir("sub_dir$i")
866866
open("file$i", "w") do f end
867867

868868
mkdir(joinpath("sub_dir1", "subsub_dir$i"))
869-
open(joinpath("sub_dir1", "file$i"), "w") do f end
869+
touch(joinpath("sub_dir1", "file$i"))
870870
end
871-
open(joinpath("sub_dir2", "file_dir2"), "w")
871+
touch(joinpath("sub_dir2", "file_dir2"))
872872
has_symlinks = @unix? true : (Base.windows_version() >= Base.WINDOWS_VISTA_VER)
873873
follow_symlink_vec = has_symlinks ? [true, false] : [false]
874874
has_symlinks && symlink(abspath("sub_dir2"), joinpath("sub_dir1", "link"))
@@ -954,7 +954,7 @@ cd(dir) do
954954
@test files == ["file_dir2"]
955955

956956
end
957-
@unix_only rm(walkdir, recursive=true)
957+
rm(dirwalk, recursive=true)
958958

959959
############
960960
# Clean up #

0 commit comments

Comments
 (0)
Please sign in to comment.