summaryrefslogtreecommitdiffstats
path: root/Source/CTest
diff options
context:
space:
mode:
authorAndy Cedilnik <andy.cedilnik@kitware.com>2005-05-03 19:28:28 (GMT)
committerAndy Cedilnik <andy.cedilnik@kitware.com>2005-05-03 19:28:28 (GMT)
commit2b29497de99411d7e468efab322ee1c4984b6467 (patch)
tree6b4bd39093b45c7882a7288e8f4cf977e1ade2d1 /Source/CTest
parentd772fce254e6cfd0d77012f9a6201fc66074c27b (diff)
downloadCMake-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/CTest')
-rw-r--r--Source/CTest/cmCTestStartCommand.cxx6
1 files changed, 5 insertions, 1 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;
}