summaryrefslogtreecommitdiffstats
path: root/Source
diff options
context:
space:
mode:
authorKen Martin <ken.martin@kitware.com>2006-07-21 18:58:13 (GMT)
committerKen Martin <ken.martin@kitware.com>2006-07-21 18:58:13 (GMT)
commit299bbcad864599fc76701b2fbe1faea09220b682 (patch)
tree3b68671136a9ce9fe121f09b3c41ce1025ea3e48 /Source
parentad748ce26e61f19ab46308dff4cb614b839fcc1c (diff)
downloadCMake-299bbcad864599fc76701b2fbe1faea09220b682.zip
CMake-299bbcad864599fc76701b2fbe1faea09220b682.tar.gz
CMake-299bbcad864599fc76701b2fbe1faea09220b682.tar.bz2
ENH: fix color output inside of ctest runs
Diffstat (limited to 'Source')
-rw-r--r--Source/cmCTest.cxx4
-rw-r--r--Source/cmake.cxx3
2 files changed, 6 insertions, 1 deletions
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<std::string>& 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;