summaryrefslogtreecommitdiffstats
path: root/Source/CTest
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2011-01-11 20:53:28 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2011-01-11 20:53:28 (GMT)
commit3ef8929ee6dd2e140d1536397aa29faee78fef81 (patch)
tree797bf8d847284837ee47602b8c0d820eef9e135f /Source/CTest
parentad543dcf09efe684f64f2ac9ec549bb5a3123540 (diff)
parent6228abed9b5856729274e680cbe64952245769d0 (diff)
downloadCMake-3ef8929ee6dd2e140d1536397aa29faee78fef81.zip
CMake-3ef8929ee6dd2e140d1536397aa29faee78fef81.tar.gz
CMake-3ef8929ee6dd2e140d1536397aa29faee78fef81.tar.bz2
Merge topic 'ctest-launch-empty-rule'
6228abe CTest: Teach launcher to ignore empty/no-op make commands
Diffstat (limited to 'Source/CTest')
-rw-r--r--Source/CTest/cmCTestLaunch.cxx7
1 files changed, 7 insertions, 0 deletions
diff --git a/Source/CTest/cmCTestLaunch.cxx b/Source/CTest/cmCTestLaunch.cxx
index 8e305b7..9831d02 100644
--- a/Source/CTest/cmCTestLaunch.cxx
+++ b/Source/CTest/cmCTestLaunch.cxx
@@ -220,6 +220,13 @@ void cmCTestLaunch::ComputeFileNames()
//----------------------------------------------------------------------------
void cmCTestLaunch::RunChild()
{
+ // Ignore noopt make rules
+ if(this->RealArgs.empty() || this->RealArgs[0] == ":")
+ {
+ this->ExitCode = 0;
+ return;
+ }
+
// Prepare to run the real command.
cmsysProcess* cp = this->Process;
cmsysProcess_SetCommand(cp, this->RealArgV);