diff options
author | Bill Hoffman <bill.hoffman@kitware.com> | 2007-09-11 15:21:36 (GMT) |
---|---|---|
committer | Bill Hoffman <bill.hoffman@kitware.com> | 2007-09-11 15:21:36 (GMT) |
commit | f262298bb037b683c995f239d1ca9fc00aaec3f3 (patch) | |
tree | 5144068cbd9df6d0c99139f227392aa5e005770e /Source/CTest | |
parent | 4835f8303b4bf9c729b00f0b3aedca6f229b2d2f (diff) | |
download | CMake-f262298bb037b683c995f239d1ca9fc00aaec3f3.zip CMake-f262298bb037b683c995f239d1ca9fc00aaec3f3.tar.gz CMake-f262298bb037b683c995f239d1ca9fc00aaec3f3.tar.bz2 |
ENH: fix 2 ctest issues, do not use the build type of ctest to look for config types, do not inherit pipes in child procs for ctest so it can kill them
Diffstat (limited to 'Source/CTest')
-rw-r--r-- | Source/CTest/cmCTestTestHandler.cxx | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/Source/CTest/cmCTestTestHandler.cxx b/Source/CTest/cmCTestTestHandler.cxx index 8026c5a..580623e 100644 --- a/Source/CTest/cmCTestTestHandler.cxx +++ b/Source/CTest/cmCTestTestHandler.cxx @@ -1090,16 +1090,6 @@ void cmCTestTestHandler { // no config specified to try some options tempPath = filepath; - tempPath += "Deployment/"; - tempPath += filename; - attempted.push_back(tempPath); - attemptedConfigs.push_back("Deployment"); - tempPath = filepath; - tempPath += "Development/"; - tempPath += filename; - attempted.push_back(tempPath); - attemptedConfigs.push_back("Deployment"); - tempPath = filepath; tempPath += "Release/"; tempPath += filename; attempted.push_back(tempPath); @@ -1119,6 +1109,16 @@ void cmCTestTestHandler tempPath += filename; attempted.push_back(tempPath); attemptedConfigs.push_back("RelWithDebInfo"); + tempPath = filepath; + tempPath += "Deployment/"; + tempPath += filename; + attempted.push_back(tempPath); + attemptedConfigs.push_back("Deployment"); + tempPath = filepath; + tempPath += "Development/"; + tempPath += filename; + attempted.push_back(tempPath); + attemptedConfigs.push_back("Deployment"); } } |