mirrors/phobos
1
0
Fork 0
mirror of https://github.com/dlang/phobos.git synced 2025-05-04 17:11:26 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fix hardcoded deleteme dir entry

Browse source
This commit is contained in:
Andrei Alexandrescu 2012-04-07 20:49:38 -05:00
parent d2a605d8ec
commit 2a8f28131c
1 changed files with 12 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

22
std/file.d
View file

@ -2463,20 +2463,22 @@ version(Windows) unittest
version(Posix) unittest version(Posix) unittest
{ {
auto d = "/tmp/deleteme/a/b/c/d/e/f/g"; collectException(rmdirRecurse(deleteme));
auto d = deleteme~"/a/b/c/d/e/f/g";
enforce(collectException(mkdir(d))); enforce(collectException(mkdir(d)));
mkdirRecurse(d); mkdirRecurse(d);
core.sys.posix.unistd.symlink("/tmp/deleteme/a/b/c", "/tmp/deleteme/link"); core.sys.posix.unistd.symlink((deleteme~"/a/b/c\0").ptr,
rmdirRecurse("/tmp/deleteme/link"); (deleteme~"/link\0").ptr);
rmdirRecurse(deleteme~"/link");
enforce(exists(d)); enforce(exists(d));
rmdirRecurse("/tmp/deleteme"); rmdirRecurse(deleteme);
enforce(!exists("/tmp/deleteme")); enforce(!exists(deleteme));
d = "/tmp/deleteme/a/b/c/d/e/f/g"; d = deleteme~"/a/b/c/d/e/f/g";
mkdirRecurse(d); mkdirRecurse(d);
std.process.system("ln -sf /tmp/deleteme/a/b/c /tmp/deleteme/link"); std.process.system("ln -sf "~deleteme~"/a/b/c /tmp/"~deleteme~"/link");
rmdirRecurse("/tmp/deleteme"); rmdirRecurse(deleteme);
enforce(!exists("/tmp/deleteme")); enforce(!exists(deleteme));
} }
unittest unittest
@ -2931,7 +2933,7 @@ auto dirEntries(string path, string pattern, SpanMode mode,
DirEntry dirEntry(in char[] name) DirEntry dirEntry(in char[] name)
{ {
if(!name.exists) if(!name.exists)
throw new FileException(text("File ", name, " does not exist.")); throw new FileException(text("File ", name, " does not exist"));
DirEntry dirEntry; DirEntry dirEntry;