diff options
| -rw-r--r-- | Source/CTest/cmCTestScriptHandler.cxx | 31 |
1 files changed, 5 insertions, 26 deletions
diff --git a/Source/CTest/cmCTestScriptHandler.cxx b/Source/CTest/cmCTestScriptHandler.cxx index 2d35f97..a51bd4b 100644 --- a/Source/CTest/cmCTestScriptHandler.cxx +++ b/Source/CTest/cmCTestScriptHandler.cxx @@ -175,30 +175,13 @@ int cmCTestScriptHandler::ExtractVariables() // get some info that should be set m_Makefile = m_LocalGenerator->GetMakefile(); - m_SourceDir.clear(); - m_BinaryDir.clear(); - m_CTestCmd.clear(); - - if (m_Makefile->GetDefinition("CTEST_SOURCE_DIRECTORY")) - { - m_SourceDir = m_Makefile->GetDefinition("CTEST_SOURCE_DIRECTORY"); - } - if (m_Makefile->GetDefinition("CTEST_BINARY_DIRECTORY")) - { - m_BinaryDir = m_Makefile->GetDefinition("CTEST_BINARY_DIRECTORY"); - } - if (m_Makefile->GetDefinition("CTEST_COMMAND")) - { - m_CTestCmd = m_Makefile->GetDefinition("CTEST_COMMAND"); - } + m_SourceDir = m_Makefile->GetSafeDefinition("CTEST_SOURCE_DIRECTORY"); + m_BinaryDir = m_Makefile->GetSafeDefinition("CTEST_BINARY_DIRECTORY"); + m_CTestCmd = m_Makefile->GetSafeDefinition("CTEST_COMMAND"); m_Backup = m_Makefile->IsOn("CTEST_BACKUP_AND_RESTORE"); // in order to backup and restore we also must have the cvs root - m_CVSCheckOut.clear(); - if (m_Makefile->GetDefinition("CTEST_CVS_CHECKOUT")) - { - m_CVSCheckOut = m_Makefile->GetDefinition("CTEST_CVS_CHECKOUT"); - } + m_CVSCheckOut = m_Makefile->GetSafeDefinition("CTEST_CVS_CHECKOUT"); if (m_Backup && m_CVSCheckOut.empty()) { cmSystemTools::Error( @@ -241,11 +224,7 @@ int cmCTestScriptHandler::ExtractVariables() atof(m_Makefile->GetDefinition("CTEST_CONTINUOUS_MINIMUM_INTERVAL")); } - m_CVSCmd.clear(); - if (m_Makefile->GetDefinition("CTEST_CVS_COMMAND")) - { - m_CVSCmd = m_Makefile->GetDefinition("CTEST_CVS_COMMAND"); - } + m_CVSCmd = m_Makefile->GetSafeDefinition("CTEST_CVS_COMMAND"); return 0; } |