From 9a2be4fb765fe39c144c5fa56b427cd9426c7364 Mon Sep 17 00:00:00 2001 From: Sven Strickroth Date: Wed, 4 Mar 2015 21:34:22 +0100 Subject: [PATCH] Make cleaning up directories which contain files work Signed-off-by: Sven Strickroth --- test/UnitTests/AutoTempDir.cpp | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/test/UnitTests/AutoTempDir.cpp b/test/UnitTests/AutoTempDir.cpp index b814fb30d..2a773a108 100644 --- a/test/UnitTests/AutoTempDir.cpp +++ b/test/UnitTests/AutoTempDir.cpp @@ -19,7 +19,7 @@ #include "stdafx.h" #include "AutoTempDir.h" -#include "DirFileEnum.h" +#include "TGitPath.h" CAutoTempDir::CAutoTempDir() { @@ -36,20 +36,7 @@ CAutoTempDir::CAutoTempDir() CAutoTempDir::~CAutoTempDir() { if (!tempdir.IsEmpty()) - { - CDirFileEnum finder(tempdir); - bool isDir; - CString filepath; - while (finder.NextFile(filepath, &isDir)) - { - ::SetFileAttributes(filepath, FILE_ATTRIBUTE_NORMAL); - if (isDir) - ::RemoveDirectory(filepath); - else - ::DeleteFile(filepath); - } - RemoveDirectory(tempdir); - } + CTGitPath(tempdir).Delete(false); } CString CAutoTempDir::GetTempDir() const -- 2.11.4.GIT