mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-02 03:39:43 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'upstream-KWSys' into update-kwsys

Browse Source 
* upstream-KWSys:
  KWSys 2018-05-15 (5f757898)

Fixes: #16001
This commit is contained in:
Brad King
2018-05-16 09:51:20 -04:00
parent c698dbd45d 1e0a2e9377
commit 24367563d7
2 changed files with 35 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Source/kwsys/SystemTools.cxx
View File

@@ -2282,7 +2282,9 @@ bool SystemTools::CopyADirectory(const std::string& source,
const std::string& destination, bool always)
{
Directory dir;
dir.Load(source);
if (dir.Load(source) == 0) {
return false;
}
size_t fileNum;
if (!SystemTools::MakeDirectory(destination)) {
return false;

33
Source/kwsys/testDirectory.cxx
View File

@@ -73,7 +73,38 @@ int _doLongPathTest()
return res;
}
int _copyDirectoryTest()
{
using namespace kwsys;
const std::string source(TEST_SYSTEMTOOLS_BINARY_DIR
"/directory_testing/copyDirectoryTestSrc");
if (SystemTools::PathExists(source)) {
std::cerr << source << " shouldn't exist before test" << std::endl;
return 1;
}
const std::string destination(TEST_SYSTEMTOOLS_BINARY_DIR
"/directory_testing/copyDirectoryTestDst");
if (SystemTools::PathExists(destination)) {
std::cerr << destination << " shouldn't exist before test" << std::endl;
return 2;
}
const bool copysuccess = SystemTools::CopyADirectory(source, destination);
const bool destinationexists = SystemTools::PathExists(destination);
if (copysuccess) {
std::cerr << "CopyADirectory should have returned false" << std::endl;
SystemTools::RemoveADirectory(destination);
return 3;
}
if (destinationexists) {
std::cerr << "CopyADirectory returned false, but destination directory"
<< " has been created" << std::endl;
SystemTools::RemoveADirectory(destination);
return 4;
}
return 0;
}
int testDirectory(int, char* [])
{
return _doLongPathTest();
return _doLongPathTest() + _copyDirectoryTest();
}