mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-05 13:20:47 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge topic 'update-kwsys'

Browse Source 
ead4adad75 Merge branch 'upstream-KWSys' into update-kwsys
36819d99c1 KWSys 2020-07-24 (c3054d90)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5055
This commit is contained in:
Brad King
2020-07-28 12:21:27 +00:00
committed by Kitware Robot
parent 8f18382c66 ead4adad75
commit 1091e64177
5 changed files with 34 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Source/kwsys/Glob.hxx.in
View File

@@ -126,8 +126,8 @@ protected:
bool RecurseListDirs;
private:
Glob(const Glob&); // Not implemented.
void operator=(const Glob&); // Not implemented.
Glob(const Glob&) = delete;
void operator=(const Glob&) = delete;
};
} // namespace @KWSYS_NAMESPACE@

6
Source/kwsys/ProcessUNIX.c
View File

@@ -2128,17 +2128,17 @@ static void kwsysProcessSetExitExceptionByIndex(kwsysProcess* cp, int sig,
#endif
#ifdef SIGABRT
case SIGABRT:
KWSYSPE_CASE(Other, "Child aborted");
KWSYSPE_CASE(Other, "Subprocess aborted");
break;
#endif
#ifdef SIGKILL
case SIGKILL:
KWSYSPE_CASE(Other, "Child killed");
KWSYSPE_CASE(Other, "Subprocess killed");
break;
#endif
#ifdef SIGTERM
case SIGTERM:
KWSYSPE_CASE(Other, "Child terminated");
KWSYSPE_CASE(Other, "Subprocess terminated");
break;
#endif
#ifdef SIGHUP

2
Source/kwsys/SystemTools.cxx
View File

@@ -1453,7 +1453,7 @@ bool SystemTools::PathCygwinToWin32(const char* path, char* win32_path)
bool SystemTools::Touch(const std::string& filename, bool create)
{
if (!SystemTools::PathExists(filename)) {
if (!SystemTools::FileExists(filename)) {
if (create) {
FILE* file = Fopen(filename, "a+b");
if (file) {

11
Source/kwsys/testProcess.c
View File

@@ -450,24 +450,25 @@ static int runChild2(kwsysProcess* kp, const char* cmd[], int state,
printf("The process is still executing.\n");
break;
case kwsysProcess_State_Expired:
printf("Child was killed when timeout expired.\n");
printf("Subprocess was killed when timeout expired.\n");
break;
case kwsysProcess_State_Exited:
printf("Child exited with value = %d\n", kwsysProcess_GetExitValue(kp));
printf("Subprocess exited with value = %d\n",
kwsysProcess_GetExitValue(kp));
result = ((exception != kwsysProcess_GetExitException(kp)) ||
(value != kwsysProcess_GetExitValue(kp)));
break;
case kwsysProcess_State_Killed:
printf("Child was killed by parent.\n");
printf("Subprocess was killed by parent.\n");
break;
case kwsysProcess_State_Exception:
printf("Child terminated abnormally: %s\n",
printf("Subprocess terminated abnormally: %s\n",
kwsysProcess_GetExceptionString(kp));
result = ((exception != kwsysProcess_GetExitException(kp)) ||
(value != kwsysProcess_GetExitValue(kp)));
break;
case kwsysProcess_State_Disowned:
printf("Child was disowned.\n");
printf("Subprocess was disowned.\n");
break;
case kwsysProcess_State_Error:
printf("Error in administrating child process: [%s]\n",

22
Source/kwsys/testSystemTools.cxx
View File

@@ -422,6 +422,28 @@ static bool CheckFileOperations()
res = false;
}
#if !defined(_WIN32)
std::string const testBadSymlink(testNewDir + "/badSymlink.txt");
std::string const testBadSymlinkTgt(testNewDir + "/missing/symlinkTgt.txt");
if (!kwsys::SystemTools::CreateSymlink(testBadSymlinkTgt, testBadSymlink)) {
std::cerr << "Problem with CreateSymlink for: " << testBadSymlink << " -> "
<< testBadSymlinkTgt << std::endl;
res = false;
}
if (!kwsys::SystemTools::Touch(testBadSymlink, false)) {
std::cerr << "Problem with Touch (no create) for: " << testBadSymlink
<< std::endl;
res = false;
}
#endif
if (!kwsys::SystemTools::Touch(testNewDir, false)) {
std::cerr << "Problem with Touch (no create) for: " << testNewDir
<< std::endl;
res = false;
}
kwsys::SystemTools::Touch(testNewFile, true);
if (!kwsys::SystemTools::RemoveADirectory(testNewDir)) {
std::cerr << "Problem with RemoveADirectory for: " << testNewDir