luke
/
klayout
mirror of https://github.com/KLayout/klayout.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Trying to fix an issue on windows with recursive file remove

This commit is contained in:
Matthias Koefferlein 2023-11-09 19:26:02 +01:00
parent 041fb53d04
commit e4823a8343
2 changed files with 37 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/tl/tl/tlFileUtils.cc
View File

@ -381,7 +381,7 @@ std::vector<std::string> dir_entries (const std::string &s, bool with_files, boo
struct _wfinddata_t fileinfo; struct _wfinddata_t fileinfo;
intptr_t h = _wfindfirst (tl::to_wstring (s + "\\*.*").c_str (), &fileinfo); intptr_t h = _wfindfirst (tl::to_wstring (s + "\\*").c_str (), &fileinfo);
if (h != -1) { if (h != -1) {
do { do {

36
src/tl/unit_tests/tlFileUtilsTests.cc
View File

@ -121,6 +121,8 @@ TEST (2)
EXPECT_EQ (b1dir.exists (), false); EXPECT_EQ (b1dir.exists (), false);
EXPECT_EQ (b2dir.exists (), false); EXPECT_EQ (b2dir.exists (), false);
EXPECT_EQ (QFileInfo (b2dir.absoluteFilePath (QString::fromUtf8 ("x"))).exists (), false); EXPECT_EQ (QFileInfo (b2dir.absoluteFilePath (QString::fromUtf8 ("x"))).exists (), false);
} }
#endif #endif
@ -164,6 +166,40 @@ TEST (2_NOQT)
EXPECT_EQ (tl::file_exists (b1dir), false); EXPECT_EQ (tl::file_exists (b1dir), false);
EXPECT_EQ (tl::file_exists (tl::combine_path (b2dir, "x")), false); EXPECT_EQ (tl::file_exists (tl::combine_path (b2dir, "x")), false);
EXPECT_EQ (tl::file_exists (tl::combine_path (b2dir, "y")), false); EXPECT_EQ (tl::file_exists (tl::combine_path (b2dir, "y")), false);
// with dotfiles and dotdirs
adir = tl::combine_path (tmp_dir, ".a");
tl::mkpath (adir);
EXPECT_EQ (tl::file_exists (adir), true);
EXPECT_EQ (tl::rm_dir_recursive (adir), true);
EXPECT_EQ (tl::file_exists (adir), false);
b1dir = tl::combine_path (adir, ".b1");
tl::mkpath (b1dir);
EXPECT_EQ (tl::file_exists (b1dir), true);
b2dir = tl::combine_path (adir, ".b2");
tl::mkpath (b2dir);
EXPECT_EQ (tl::file_exists (b1dir), true);
{
tl::OutputStream os (tl::absolute_file_path (tl::combine_path (b2dir, ".x")));
os << "hello, world!\n";
}
{
tl::OutputStream os (tl::absolute_file_path (tl::combine_path (b2dir, ".y")));
os << "hello, world!\n";
}
EXPECT_EQ (tl::file_exists (adir), true);
EXPECT_EQ (tl::rm_dir_recursive (adir), true);
EXPECT_EQ (tl::file_exists (adir), false);
EXPECT_EQ (tl::file_exists (b1dir), false);
EXPECT_EQ (tl::file_exists (tl::combine_path (b2dir, ".x")), false);
EXPECT_EQ (tl::file_exists (tl::combine_path (b2dir, ".y")), false);
} }
#if defined(HAVE_QT) #if defined(HAVE_QT)