summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndy Cedilnik <andy.cedilnik@kitware.com>2005-05-08 17:47:20 (GMT)
committerAndy Cedilnik <andy.cedilnik@kitware.com>2005-05-08 17:47:20 (GMT)
commit4e49c3bf6e6782f961153732a8fe1258fc7e7f2f (patch)
tree2525a9c0b72de528103626fae9b7a50938d56824
parent26e8ff9ab6b62ca6ea69e1dec5f313a1645b5db7 (diff)
downloadCMake-4e49c3bf6e6782f961153732a8fe1258fc7e7f2f.zip
CMake-4e49c3bf6e6782f961153732a8fe1258fc7e7f2f.tar.gz
CMake-4e49c3bf6e6782f961153732a8fe1258fc7e7f2f.tar.bz2
ENH: Add method so that ctest handlers and commands can add notes
-rw-r--r--Source/cmCTest.cxx28
-rw-r--r--Source/cmCTest.h11
2 files changed, 30 insertions, 9 deletions
diff --git a/Source/cmCTest.cxx b/Source/cmCTest.cxx
index de211b4..0ee953e 100644
--- a/Source/cmCTest.cxx
+++ b/Source/cmCTest.cxx
@@ -236,6 +236,7 @@ cmCTest::cmCTest()
m_TimeOut = 0;
m_CompressXMLFiles = false;
m_CTestConfigFile = "";
+ m_SuppressUpdatingCTestConfiguration = false;
int cc;
for ( cc=0; cc < cmCTest::LAST_TEST; cc ++ )
{
@@ -373,6 +374,10 @@ int cmCTest::Initialize(const char* binary_dir, bool new_tag)
bool cmCTest::UpdateCTestConfiguration()
{
+ if ( m_SuppressUpdatingCTestConfiguration )
+ {
+ return true;
+ }
std::string fileName = m_CTestConfigFile;
if ( fileName.empty() )
{
@@ -1032,6 +1037,19 @@ int cmCTest::GenerateCTestNotesOutput(std::ostream& os, const cmCTest::tm_Vector
return 1;
}
+int cmCTest::GenerateNotesFile(const std::vector<cmStdString> &files)
+{
+ cmGeneratedFileStream ofs;
+ if ( !this->OpenOutputFile(m_CurrentTag, "Notes.xml", ofs) )
+ {
+ std::cerr << "Cannot open notes file" << std::endl;
+ return 1;
+ }
+
+ this->GenerateCTestNotesOutput(ofs, files);
+ return 0;
+}
+
int cmCTest::GenerateNotesFile(const char* cfiles)
{
if ( !cfiles )
@@ -1049,15 +1067,7 @@ int cmCTest::GenerateNotesFile(const char* cfiles)
return 1;
}
- cmGeneratedFileStream ofs;
- if ( !this->OpenOutputFile(m_CurrentTag, "Notes.xml", ofs) )
- {
- std::cerr << "Cannot open notes file" << std::endl;
- return 1;
- }
-
- this->GenerateCTestNotesOutput(ofs, files);
- return 0;
+ return this->GenerateNotesFile(files);
}
int cmCTest::Run(std::vector<std::string>const& args, std::string* output)
diff --git a/Source/cmCTest.h b/Source/cmCTest.h
index 0c40497..b3996ff 100644
--- a/Source/cmCTest.h
+++ b/Source/cmCTest.h
@@ -196,6 +196,16 @@ public:
//! Make string safe to be send as an URL
static std::string MakeURLSafe(const std::string&);
+
+ //! Should ctect configuration be updated. When using new style ctest script,
+ // this should be true.
+ void SetSuppressUpdatingCTestConfiguration(bool val)
+ {
+ m_SuppressUpdatingCTestConfiguration = val;
+ }
+
+ //! Create XML file that contains all the notes specified
+ int GenerateNotesFile(const std::vector<cmStdString> &files);
private:
std::string m_ConfigType;
bool m_Verbose;
@@ -291,6 +301,7 @@ private:
///! Find the running cmake
void FindRunningCMake(const char* arg0);
+ bool m_SuppressUpdatingCTestConfiguration;
};
#endif