diff options
author | Andy Cedilnik <andy.cedilnik@kitware.com> | 2005-06-16 17:18:21 (GMT) |
---|---|---|
committer | Andy Cedilnik <andy.cedilnik@kitware.com> | 2005-06-16 17:18:21 (GMT) |
commit | 2cc5ed49d17e5a26308d3af288767e7ef405903b (patch) | |
tree | a918403b8c04e6058785876c71e8b79cffd36948 /Source/CTest/cmCTestStartCommand.cxx | |
parent | b156314ab3cedc7fa1c8198a320be4a05dd6ff8d (diff) | |
download | CMake-2cc5ed49d17e5a26308d3af288767e7ef405903b.zip CMake-2cc5ed49d17e5a26308d3af288767e7ef405903b.tar.gz CMake-2cc5ed49d17e5a26308d3af288767e7ef405903b.tar.bz2 |
ENH: Several improvements to CTest:
1. Support for showing line numbers when debugging ctest --show-line-numbers
2. Modify the ctest initialization code, so that it can be delayed
3. Handlers now have corresponding command if they were invoked from the command (so far only update actually use that)
4. Start command is simplified and the functionality is moved to CTest
5. Update can perform initial checkout if CTEST_CHECKOUT_COMMAND is set
6. Add test that checks out kwsys and perform tests on the fresh checkout
Diffstat (limited to 'Source/CTest/cmCTestStartCommand.cxx')
-rw-r--r-- | Source/CTest/cmCTestStartCommand.cxx | 34 |
1 files changed, 5 insertions, 29 deletions
diff --git a/Source/CTest/cmCTestStartCommand.cxx b/Source/CTest/cmCTestStartCommand.cxx index 096be9e..d3d3648 100644 --- a/Source/CTest/cmCTestStartCommand.cxx +++ b/Source/CTest/cmCTestStartCommand.cxx @@ -64,43 +64,19 @@ bool cmCTestStartCommand::InitialPass( this->SetError("binary directory not specified. Specify binary directory as an argument or set CTEST_BINARY_DIRECTORY"); return false; } - cmCTestLog(m_CTest, OUTPUT, "Run dashboard with model " << smodel - << " for src dir: " << src_dir << " and binary dir: " << bld_dir << std::endl); - - std::string fname = src_dir; - fname += "/CTestConfig.cmake"; - cmSystemTools::ConvertToUnixSlashes(fname); - if ( cmSystemTools::FileExists(fname.c_str()) ) - { - cmCTestLog(m_CTest, OUTPUT, " Reading ctest configuration file: " << fname.c_str() << std::endl); - bool readit = m_Makefile->ReadListFile(m_Makefile->GetCurrentListFile(), - fname.c_str() ); - if(!readit) - { - std::string m = "Could not find include file: "; - m += fname; - this->SetError(m.c_str()); - return false; - } - } - - m_CTest->SetCTestConfigurationFromCMakeVariable(m_Makefile, "NightlyStartTime", "CTEST_NIGHTLY_START_TIME"); - m_CTest->SetCTestConfigurationFromCMakeVariable(m_Makefile, "Site", "CTEST_SITE"); - m_CTest->SetCTestConfigurationFromCMakeVariable(m_Makefile, "BuildName", "CTEST_BUILD_NAME"); m_CTest->SetCTestConfiguration("SourceDirectory", src_dir); m_CTest->SetCTestConfiguration("BuildDirectory", bld_dir); + cmCTestLog(m_CTest, OUTPUT, "Run dashboard with model " << smodel << std::endl + << " Source directory: " << src_dir << std::endl << " Build directory: " << bld_dir << std::endl); + m_Makefile->AddDefinition("CTEST_RUN_CURRENT_SCRIPT", "OFF"); m_CTest->SetSuppressUpdatingCTestConfiguration(true); - int model = m_CTest->GetTestModelFromString(smodel); m_CTest->SetTestModel(model); m_CTest->SetProduceXML(true); - if ( !m_CTest->Initialize(bld_dir, true) ) - { - return false; - } - return true; + + return m_CTest->InitializeFromCommand(this, true); } |