kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

This commit is contained in:
Andy Cedilnik 2005-05-03 15:28:28 -04:00
parent d772fce254
commit 2b29497de9
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Source/CTest/cmCTestStartCommand.cxx
View File

@ -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;
}

4
Source/cmCTest.cxx
View File

@ -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;

2
Source/cmCTest.h
View File

@ -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();
/**