summaryrefslogtreecommitdiffstats
path: root/Source/CTest/cmCTestTestHandler.cxx
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2011-06-10 13:29:30 (GMT)
committerBrad King <brad.king@kitware.com>2011-06-10 13:52:18 (GMT)
commita4ec24269b32a28104e1d5681e718024b28bb4e7 (patch)
treefd4b0c30093063aa38bb65e2921d43aee01353fc /Source/CTest/cmCTestTestHandler.cxx
parent77ddb6a0cd35996f1329d727a25de3460f6aa899 (diff)
downloadCMake-a4ec24269b32a28104e1d5681e718024b28bb4e7.zip
CMake-a4ec24269b32a28104e1d5681e718024b28bb4e7.tar.gz
CMake-a4ec24269b32a28104e1d5681e718024b28bb4e7.tar.bz2
CTest: Report tests not run due to unknown configuration
When add_test(NAME) is called without the CONFIGURATIONS argument then the test is intended to run in any configuration. In multi-config generators like the VS IDE and Xcode tests created by add_test(NAME) can only be run when testing a known configuration (otherwise there is no way to generate the test command line). If no test command line is known for a particular configuration, or if no configuration is given to ctest, report the test as not run instead of silently skipping it. Also fix CMake's own TestsWorkingDirectory test invocation to correct a previously silent failure exposed by this change.
Diffstat (limited to 'Source/CTest/cmCTestTestHandler.cxx')
-rw-r--r--Source/CTest/cmCTestTestHandler.cxx4
1 files changed, 4 insertions, 0 deletions
diff --git a/Source/CTest/cmCTestTestHandler.cxx b/Source/CTest/cmCTestTestHandler.cxx
index 56f6630..e3b81df 100644
--- a/Source/CTest/cmCTestTestHandler.cxx
+++ b/Source/CTest/cmCTestTestHandler.cxx
@@ -1320,6 +1320,10 @@ std::string cmCTestTestHandler::FindTheExecutable(const char *exe)
std::string resConfig;
std::vector<std::string> extraPaths;
std::vector<std::string> failedPaths;
+ if(strcmp(exe, "NOT_AVAILABLE") == 0)
+ {
+ return exe;
+ }
return cmCTestTestHandler::FindExecutable(this->CTest,
exe, resConfig,
extraPaths,