From 299bbcad864599fc76701b2fbe1faea09220b682 Mon Sep 17 00:00:00 2001 From: Ken Martin Date: Fri, 21 Jul 2006 14:58:13 -0400 Subject: ENH: fix color output inside of ctest runs --- Source/cmCTest.cxx | 4 ++++ Source/cmake.cxx | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/Source/cmCTest.cxx b/Source/cmCTest.cxx index 390774f..b5e79a4 100644 --- a/Source/cmCTest.cxx +++ b/Source/cmCTest.cxx @@ -289,6 +289,10 @@ int cmCTest::Initialize(const char* binary_dir, bool new_tag, { this->BlockTestErrorDiagnostics(); } + else + { + cmSystemTools::PutEnv("CTEST_INTERACTIVE_DEBUG_MODE=1"); + } this->BinaryDir = binary_dir; cmSystemTools::ConvertToUnixSlashes(this->BinaryDir); diff --git a/Source/cmake.cxx b/Source/cmake.cxx index f3b28bf..aaa743f 100644 --- a/Source/cmake.cxx +++ b/Source/cmake.cxx @@ -2554,7 +2554,8 @@ int cmake::ExecuteEchoColor(std::vector& args) // likely no. int assumeTTY = cmsysTerminal_Color_AssumeTTY; if(cmSystemTools::GetEnv("DART_TEST_FROM_DART") || - cmSystemTools::GetEnv("DASHBOARD_TEST_FROM_CTEST")) + cmSystemTools::GetEnv("DASHBOARD_TEST_FROM_CTEST") || + cmSystemTools::GetEnv("CTEST_INTERACTIVE_DEBUG_MODE")) { // Avoid printing color escapes during dashboard builds. assumeTTY = 0; -- cgit v0.12