diff options
| author | Andy Cedilnik <andy.cedilnik@kitware.com> | 2005-05-03 19:28:28 (GMT) |
|---|---|---|
| committer | Andy Cedilnik <andy.cedilnik@kitware.com> | 2005-05-03 19:28:28 (GMT) |
| commit | 2b29497de99411d7e468efab322ee1c4984b6467 (patch) | |
| tree | 6b4bd39093b45c7882a7288e8f4cf977e1ade2d1 /Source | |
| parent | d772fce254e6cfd0d77012f9a6201fc66074c27b (diff) | |
| download | CMake-2b29497de99411d7e468efab322ee1c4984b6467.zip CMake-2b29497de99411d7e468efab322ee1c4984b6467.tar.gz CMake-2b29497de99411d7e468efab322ee1c4984b6467.tar.bz2 | |
ENH: Add Site and BuildName, make sure that the rest of the default -S rule does not happen, and make sure that new tag will be created
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/CTest/cmCTestStartCommand.cxx | 6 | ||||
| -rw-r--r-- | Source/cmCTest.cxx | 4 | ||||
| -rw-r--r-- | Source/cmCTest.h | 2 |
3 files changed, 8 insertions, 4 deletions
diff --git a/Source/CTest/cmCTestStartCommand.cxx b/Source/CTest/cmCTestStartCommand.cxx index 8f532cb..248aa24 100644 --- a/Source/CTest/cmCTestStartCommand.cxx +++ b/Source/CTest/cmCTestStartCommand.cxx @@ -85,13 +85,17 @@ bool cmCTestStartCommand::InitialPass( } 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); + m_Makefile->AddDefinition("CTEST_RUN_CURRENT_SCRIPT", "OFF"); + int model = m_CTest->GetTestModelFromString(smodel); m_CTest->SetTestModel(model); m_CTest->SetProduceXML(true); - if ( !m_CTest->Initialize(bld_dir) ) + if ( !m_CTest->Initialize(bld_dir, true) ) { return false; } diff --git a/Source/cmCTest.cxx b/Source/cmCTest.cxx index fee43b5..c3147c4 100644 --- a/Source/cmCTest.cxx +++ b/Source/cmCTest.cxx @@ -269,7 +269,7 @@ cmCTest::~cmCTest() } } -int cmCTest::Initialize(const char* binary_dir) +int cmCTest::Initialize(const char* binary_dir, bool new_tag) { if(!m_InteractiveDebugMode) { @@ -338,7 +338,7 @@ int cmCTest::Initialize(const char* binary_dir) } tfin.close(); } - if ( tag.size() == 0 || m_Tests[cmCTest::START_TEST] || m_Tests[ALL_TEST]) + if ( tag.size() == 0 || new_tag || m_Tests[cmCTest::START_TEST] || m_Tests[ALL_TEST]) { //std::cout << "TestModel: " << this->GetTestModelString() << std::endl; //std::cout << "TestModel: " << m_TestModel << std::endl; diff --git a/Source/cmCTest.h b/Source/cmCTest.h index 5e6652f..e5ed323 100644 --- a/Source/cmCTest.h +++ b/Source/cmCTest.h @@ -39,7 +39,7 @@ public: /** * Initialize and finalize testing */ - int Initialize(const char* binary_dir); + int Initialize(const char* binary_dir, bool new_tag = false); void Finalize(); /** |