diff options
| author | Brad King <brad.king@kitware.com> | 2024-01-22 19:55:47 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2024-01-24 22:10:00 (GMT) |
| commit | bcbb212df704d36736731aa567b291fd97401804 (patch) | |
| tree | 6fef8b57dd7aa10c9f15447b18dc74951de68dad /Source/cmCTest.h | |
| parent | adb3e13d323aeb19c3824112cfa712cc122db3b4 (diff) | |
| download | CMake-bcbb212df704d36736731aa567b291fd97401804.zip CMake-bcbb212df704d36736731aa567b291fd97401804.tar.gz CMake-bcbb212df704d36736731aa567b291fd97401804.tar.bz2 | |
Revert use of libuv for process execution for 3.28
Wide use of CMake 3.28.{1,0[-rcN]} has uncovered some hangs and crashes
in libuv SIGCHLD handling on some platforms, particularly in virtualization
environments on macOS hosts. Although the bug does not seem to be in CMake,
we can restore stability in the CMake 3.28 release series for users of such
platforms by reverting our new uses of libuv for process execution.
Revert implementation changes merged by commit 4771544386 (Merge topic
'replace-cmsysprocess-with-cmuvprocesschain', 2023-09-06, v3.28.0-rc1~138),
but keep test suite updates.
Issue: #25414, #25500, #25562, #25589
Diffstat (limited to 'Source/cmCTest.h')
| -rw-r--r-- | Source/cmCTest.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/Source/cmCTest.h b/Source/cmCTest.h index 1644d84..9a8d5a6 100644 --- a/Source/cmCTest.h +++ b/Source/cmCTest.h @@ -254,10 +254,10 @@ public: * Run command specialized for make and configure. Returns process status * and retVal is return value or exception. */ - bool RunMakeCommand(const std::string& command, std::string& output, - int* retVal, const char* dir, cmDuration timeout, - std::ostream& ofs, - Encoding encoding = cmProcessOutput::Auto); + int RunMakeCommand(const std::string& command, std::string& output, + int* retVal, const char* dir, cmDuration timeout, + std::ostream& ofs, + Encoding encoding = cmProcessOutput::Auto); /** Return the current tag */ std::string GetCurrentTag(); @@ -303,10 +303,10 @@ public: * environment variables prior to running the test. After running the test, * environment variables are restored to their previous values. */ - bool RunTest(const std::vector<std::string>& args, std::string* output, - int* retVal, std::ostream* logfile, cmDuration testTimeOut, - std::vector<std::string>* environment, - Encoding encoding = cmProcessOutput::Auto); + int RunTest(std::vector<const char*> args, std::string* output, int* retVal, + std::ostream* logfile, cmDuration testTimeOut, + std::vector<std::string>* environment, + Encoding encoding = cmProcessOutput::Auto); /** * Get the handler object |