From bbb237035919ef62b72a5ab6cce3edda4ad0172f Mon Sep 17 00:00:00 2001 From: KWSys Upstream Date: Fri, 8 Aug 2025 08:18:30 -0400 Subject: [PATCH 1/2] KWSys 2025-08-08 (2c189f30) Code extracted from: https://gitlab.kitware.com/utils/kwsys.git at commit 2c189f30f633a0e40b1bf4c3861fae4ca167358a (master). Upstream Shortlog ----------------- Brad King (1): 7322a140 Process: Remove stray newline in GetExceptionString result --- ProcessWin32.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ProcessWin32.c b/ProcessWin32.c index 39357f6359..26ec57d33e 100644 --- a/ProcessWin32.c +++ b/ProcessWin32.c @@ -2145,7 +2145,7 @@ static void kwsysProcessSetExitExceptionByIndex(kwsysProcess* cp, int code, default: cp->ProcessResults[idx].ExitException = kwsysProcess_Exception_Other; snprintf(cp->ProcessResults[idx].ExitExceptionString, - KWSYSPE_PIPE_BUFFER_SIZE, "Exit code 0x%x\n", code); + KWSYSPE_PIPE_BUFFER_SIZE, "Exit code 0x%x", code); break; } } From 9c6e53e46f0c7dba52d84df6dcadfeb1eb07a18a Mon Sep 17 00:00:00 2001 From: Brad King Date: Thu, 7 Aug 2025 10:01:33 -0400 Subject: [PATCH 2/2] ctest: Remove stray newline in process result string The plain "Exit code" string had a newline that we do not have in the other result strings. This typo was inherited from KWSys Process, which has been fixed by its upstream. Fixes: #27119 --- Source/CTest/cmProcess.cxx | 2 +- Source/cmUVProcessChain.cxx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/CTest/cmProcess.cxx b/Source/CTest/cmProcess.cxx index eefbbcfd77..70a1ebde63 100644 --- a/Source/CTest/cmProcess.cxx +++ b/Source/CTest/cmProcess.cxx @@ -536,7 +536,7 @@ std::string cmProcess::GetExitExceptionString() const case STATUS_NO_MEMORY: default: char buf[1024]; - char const* fmt = "Exit code 0x%" KWIML_INT_PRIx64 "\n"; + char const* fmt = "Exit code 0x%" KWIML_INT_PRIx64; snprintf(buf, sizeof(buf), fmt, this->ExitValue); exception_str.assign(buf); } diff --git a/Source/cmUVProcessChain.cxx b/Source/cmUVProcessChain.cxx index 4910653b33..e551083439 100644 --- a/Source/cmUVProcessChain.cxx +++ b/Source/cmUVProcessChain.cxx @@ -564,7 +564,7 @@ cmUVProcessChain::Status::GetException() const case STATUS_NO_MEMORY: default: { char buf[256]; - snprintf(buf, sizeof(buf), "Exit code 0x%x\n", + snprintf(buf, sizeof(buf), "Exit code 0x%x", static_cast(this->ExitStatus)); return std::make_pair(ExceptionCode::Other, buf); }