summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndy Cedilnik <andy.cedilnik@kitware.com>2004-02-08 18:23:48 (GMT)
committerAndy Cedilnik <andy.cedilnik@kitware.com>2004-02-08 18:23:48 (GMT)
commit9107592550dcdcd549814b72a4d5f3c1c2616097 (patch)
treeb5f8361ea27f0bbca2fabd6700444346f692c1c3
parente72bac587054b16fdc44ed597b7f03b06656d95a (diff)
downloadCMake-9107592550dcdcd549814b72a4d5f3c1c2616097.zip
CMake-9107592550dcdcd549814b72a4d5f3c1c2616097.tar.gz
CMake-9107592550dcdcd549814b72a4d5f3c1c2616097.tar.bz2
ENH: Attempt to support tests in funky subdirectories
-rw-r--r--Source/cmCTest.cxx12
1 files changed, 12 insertions, 0 deletions
diff --git a/Source/cmCTest.cxx b/Source/cmCTest.cxx
index eb14f64..fe2835a 100644
--- a/Source/cmCTest.cxx
+++ b/Source/cmCTest.cxx
@@ -4344,6 +4344,18 @@ int cmCTest::RunCMakeAndTest(std::string* outstring)
else
{
failed.push_back(tryPath);
+ std::string filepath = cmSystemTools::GetFilenamePath(m_TestCommand);
+ std::string filename = cmSystemTools::GetFilenameName(m_TestCommand);
+ tryPath = filepath + "/" + m_ConfigType + "/" + filepath;
+ if ( cmSystemTools::FileExists(tryPath.c_str()) &&
+ !cmSystemTools::FileIsDirectory(tryPath.c_str()) )
+ {
+ fullPath = cmSystemTools::CollapseFullPath(tryPath.c_str());
+ }
+ else
+ {
+ failed.push_back(tryPath);
+ }
}
}
}