mirror of
https://github.com/Kitware/CMake.git
synced 2026-04-24 07:08:38 -05:00
Merge topic 'ctest-crash-handling'
0a4ee422c1 ctest: Restore Windows Error Reporting in interactive mode
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !9855
This commit is contained in:
@@ -106,6 +106,11 @@ bool cmProcess::StartProcess(uv_loop_t& loop, std::vector<size_t>* affinity)
|
||||
options.stdio_count = 3; // in, out and err
|
||||
options.exit_cb = &cmProcess::OnExitCB;
|
||||
options.stdio = stdio;
|
||||
#if UV_VERSION_MAJOR > 1 || !defined(CMAKE_USE_SYSTEM_LIBUV)
|
||||
if (!this->Runner->GetCTest()->GetInteractiveDebugMode()) {
|
||||
options.flags = UV_PROCESS_WINDOWS_USE_PARENT_ERROR_MODE;
|
||||
}
|
||||
#endif
|
||||
#if !defined(CMAKE_USE_SYSTEM_LIBUV)
|
||||
std::vector<char> cpumask;
|
||||
if (affinity && !affinity->empty()) {
|
||||
@@ -122,9 +127,6 @@ bool cmProcess::StartProcess(uv_loop_t& loop, std::vector<size_t>* affinity)
|
||||
#else
|
||||
static_cast<void>(affinity);
|
||||
#endif
|
||||
#if UV_VERSION_MAJOR > 1 || !defined(CMAKE_USE_SYSTEM_LIBUV)
|
||||
options.flags = UV_PROCESS_WINDOWS_USE_PARENT_ERROR_MODE;
|
||||
#endif
|
||||
|
||||
status =
|
||||
uv_read_start(pipe_reader, &cmProcess::OnAllocateCB, &cmProcess::OnReadCB);
|
||||
|
||||
@@ -3096,6 +3096,11 @@ int cmCTest::GetSubmitIndex() const
|
||||
return this->Impl->SubmitIndex;
|
||||
}
|
||||
|
||||
bool cmCTest::GetInteractiveDebugMode() const
|
||||
{
|
||||
return this->Impl->InteractiveDebugMode;
|
||||
}
|
||||
|
||||
bool cmCTest::GetLabelSummary() const
|
||||
{
|
||||
return this->Impl->LabelSummary;
|
||||
|
||||
@@ -389,6 +389,8 @@ public:
|
||||
|
||||
void AddSiteProperties(cmXMLWriter& xml, cmake* cm);
|
||||
|
||||
bool GetInteractiveDebugMode() const;
|
||||
|
||||
bool GetLabelSummary() const;
|
||||
bool GetSubprojectSummary() const;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user