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

ENH: Improve notes support (now you can specify them with the rest of the command line), improve reading of configuration file (now it actually rereads configuration file after running update/configure/build...). Remember the model (nightly/experimental) across runs

This commit is contained in:
Andy Cedilnik 2004-01-06 19:13:55 -05:00
parent e365b64ff6
commit c3003ab8c3
3 changed files with 138 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

198
Source/cmCTest.cxx
View File

@ -325,6 +325,90 @@ void cmCTest::Initialize()
{
m_ToplevelPath = cmSystemTools::GetCurrentWorkingDirectory();
cmSystemTools::ConvertToUnixSlashes(m_ToplevelPath);
this->UpdateCTestConfiguration();
if ( m_DartMode )
{
std::string testingDir = m_ToplevelPath + "/Testing";
if ( cmSystemTools::FileExists(testingDir.c_str()) )
{
if ( !cmSystemTools::FileIsDirectory(testingDir.c_str()) )
{
std::cerr << "File " << testingDir << " is in the place of the testing directory"
<< std::endl;
return;
}
}
else
{
if ( !cmSystemTools::MakeDirectory(testingDir.c_str()) )
{
std::cerr << "Cannot create directory " << testingDir
<< std::endl;
return;
}
}
std::string tagfile = testingDir + "/TAG";
std::ifstream tfin(tagfile.c_str());
std::string tag;
time_t tctime = time(0);
struct tm *lctime = gmtime(&tctime);
if ( tfin && cmSystemTools::GetLineFromStream(tfin, tag) )
{
int year = 0;
int mon = 0;
int day = 0;
int hour = 0;
int min = 0;
sscanf(tag.c_str(), "%04d%02d%02d-%02d%02d",
&year, &mon, &day, &hour, &min);
if ( year != lctime->tm_year + 1900 ||
mon != lctime->tm_mon+1 ||
day != lctime->tm_mday )
{
tag = "";
}
std::string tagmode;
if ( cmSystemTools::GetLineFromStream(tfin, tagmode) )
{
if ( tagmode.size() > 4 && !( m_Tests[cmCTest::START_TEST] || m_Tests[ALL_TEST] ))
{
m_TestModel = cmCTest::GetTestModelFromString(tagmode.c_str());
}
}
tfin.close();
}
if ( tag.size() == 0 || m_Tests[cmCTest::START_TEST] || m_Tests[ALL_TEST])
{
//std::cout << "TestModel: " << this->GetTestModelString() << std::endl;
//std::cout << "TestModel: " << m_TestModel << std::endl;
if ( m_TestModel == cmCTest::NIGHTLY )
{
lctime = ::GetNightlyTime(m_DartConfiguration["NightlyStartTime"]);
}
char datestring[100];
sprintf(datestring, "%04d%02d%02d-%02d%02d",
lctime->tm_year + 1900,
lctime->tm_mon+1,
lctime->tm_mday,
lctime->tm_hour,
lctime->tm_min);
tag = datestring;
std::ofstream ofs(tagfile.c_str());
if ( ofs )
{
ofs << tag << std::endl;
ofs << this->GetTestModelString() << std::endl;
}
ofs.close();
std::cout << "Create new tag: " << tag << " - "
<< this->GetTestModelString() << std::endl;
}
m_CurrentTag = tag;
}
}
void cmCTest::UpdateCTestConfiguration()
{
// parse the dart test file
std::ifstream fin("DartConfiguration.tcl");
if(!fin)
@ -368,74 +452,6 @@ void cmCTest::Initialize()
if ( m_DartMode )
{
m_TimeOut = atoi(m_DartConfiguration["TimeOut"].c_str());
std::string testingDir = m_ToplevelPath + "/Testing";
if ( cmSystemTools::FileExists(testingDir.c_str()) )
{
if ( !cmSystemTools::FileIsDirectory(testingDir.c_str()) )
{
std::cerr << "File " << testingDir << " is in the place of the testing directory"
<< std::endl;
return;
}
}
else
{
if ( !cmSystemTools::MakeDirectory(testingDir.c_str()) )
{
std::cerr << "Cannot create directory " << testingDir
<< std::endl;
return;
}
}
std::string tagfile = testingDir + "/TAG";
std::ifstream tfin(tagfile.c_str());
std::string tag;
time_t tctime = time(0);
struct tm *lctime = gmtime(&tctime);
if ( tfin )
{
tfin >> tag;
tfin.close();
int year = 0;
int mon = 0;
int day = 0;
int hour = 0;
int min = 0;
sscanf(tag.c_str(), "%04d%02d%02d-%02d%02d",
&year, &mon, &day, &hour, &min);
if ( year != lctime->tm_year + 1900 ||
mon != lctime->tm_mon+1 ||
day != lctime->tm_mday )
{
tag = "";
}
}
if ( tag.size() == 0 || m_Tests[cmCTest::START_TEST] || m_Tests[ALL_TEST])
{
//std::cout << "TestModel: " << this->GetTestModelString() << std::endl;
//std::cout << "TestModel: " << m_TestModel << std::endl;
if ( m_TestModel == cmCTest::NIGHTLY )
{
lctime = ::GetNightlyTime(m_DartConfiguration["NightlyStartTime"]);
}
char datestring[100];
sprintf(datestring, "%04d%02d%02d-%02d%02d",
lctime->tm_year + 1900,
lctime->tm_mon+1,
lctime->tm_mday,
lctime->tm_hour,
lctime->tm_min);
tag = datestring;
std::ofstream ofs(tagfile.c_str());
if ( ofs )
{
ofs << tag << std::endl;
}
ofs.close();
std::cout << "Create new tag: " << tag << std::endl;
}
m_CurrentTag = tag;
}
}
@ -636,7 +652,7 @@ int cmCTest::UpdateDirectory()
}
os << "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
<< "<Update mode=\"Client\">\n"
<< "<Update mode=\"Client\" Generator=\"ctest\">\n"
<< "\t<Site>" <<m_DartConfiguration["Site"] << "</Site>\n"
<< "\t<BuildName>" << m_DartConfiguration["BuildName"]
<< "</BuildName>\n"
@ -2485,6 +2501,7 @@ int cmCTest::ProcessTests()
}
if ( m_Tests[BUILD_TEST] || m_Tests[ALL_TEST] )
{
this->UpdateCTestConfiguration();
if (this->BuildDirectory())
{
res |= CTEST_BUILD_ERRORS;
@ -2492,6 +2509,7 @@ int cmCTest::ProcessTests()
}
if ( m_Tests[TEST_TEST] || m_Tests[ALL_TEST] || notest )
{
this->UpdateCTestConfiguration();
if (this->TestDirectory(false))
{
res |= CTEST_TEST_ERRORS;
@ -2499,17 +2517,28 @@ int cmCTest::ProcessTests()
}
if ( m_Tests[COVERAGE_TEST] || m_Tests[ALL_TEST] )
{
this->UpdateCTestConfiguration();
this->CoverageDirectory();
}
if ( m_Tests[MEMCHECK_TEST] || m_Tests[ALL_TEST] )
{
this->UpdateCTestConfiguration();
if (this->TestDirectory(true))
{
res |= CTEST_MEMORY_ERRORS;
}
}
if ( m_Tests[NOTES_TEST] || m_Tests[ALL_TEST] )
{
this->UpdateCTestConfiguration();
if ( m_NotesFiles.size() )
{
this->GenerateNotesFile(m_NotesFiles.c_str());
}
}
if ( m_Tests[SUBMIT_TEST] || m_Tests[ALL_TEST] )
{
this->UpdateCTestConfiguration();
this->SubmitResults();
}
return res;
@ -2527,6 +2556,24 @@ std::string cmCTest::GetTestModelString()
return "Experimental";
}
int cmCTest::GetTestModelFromString(const char* str)
{
if ( !str )
{
return cmCTest::EXPERIMENTAL;
}
std::string rstr = cmSystemTools::LowerCase(str);
if ( strncmp(rstr.c_str(), "cont", 4) == 0 )
{
return cmCTest::CONTINUOUS;
}
if ( strncmp(rstr.c_str(), "nigh", 4) == 0 )
{
return cmCTest::NIGHTLY;
}
return cmCTest::EXPERIMENTAL;
}
#define SPACE_REGEX "[ \t\r\n]"
std::string cmCTest::GenerateRegressionImages(const std::string& xml)
@ -3109,7 +3156,7 @@ void cmCTest::StartXML(std::ostream& ostr)
<< "<Site BuildName=\"" << m_DartConfiguration["BuildName"]
<< "\" BuildStamp=\"" << m_CurrentTag << "-"
<< this->GetTestModelString() << "\" Name=\""
<< m_DartConfiguration["Site"] << "\">" << std::endl;
<< m_DartConfiguration["Site"] << "\" Generator=\"ctest\">" << std::endl;
}
void cmCTest::EndXML(std::ostream& ostr)
@ -3288,7 +3335,7 @@ int cmCTest::GenerateDartNotesOutput(std::ostream& os, const cmCTest::tm_VectorO
<< "<?xml-stylesheet type=\"text/xsl\" href=\"Dart/Source/Server/XSL/Build.xsl <file:///Dart/Source/Server/XSL/Build.xsl> \"?>\n"
<< "<Site BuildName=\"" << m_DartConfiguration["BuildName"] << "\" BuildStamp=\""
<< m_CurrentTag << "-" << this->GetTestModelString() << "\" Name=\""
<< m_DartConfiguration["Site"] << "\">\n"
<< m_DartConfiguration["Site"] << "\" Generator=\"ctest\">\n"
<< "<Notes>" << std::endl;
for ( it = files.begin(); it != files.end(); it ++ )
@ -3349,3 +3396,12 @@ int cmCTest::GenerateNotesFile(const char* cfiles)
return 0;
}
void cmCTest::SetNotesFiles(const char* notes)
{
if ( !notes )
{
return;
}
m_NotesFiles = notes;
}

10
Source/cmCTest.h
View File

@ -109,13 +109,18 @@ public:
{
m_TestModel = mode;
}
std::string GetTestModelString();
static int GetTestModelFromString(const char* str);
/**
* constructor
*/
cmCTest();
//! Set the notes files to be created.
void SetNotesFiles(const char* notes);
bool m_UseIncludeRegExp;
std::string m_IncludeRegExp;
@ -284,6 +289,11 @@ private:
int m_CompatibilityMode;
std::string m_NotesFiles;
//! Reread the configuration file
void UpdateCTestConfiguration();
/**
* Generate the Dart compatible output
*/

5
Source/ctest.cxx
View File

@ -383,10 +383,7 @@ int main (int argc, char *argv[])
{
inst.m_DartMode = true;
inst.SetTest("Notes");
inst.Initialize();
int ires = inst.GenerateNotesFile(args[i+1].c_str());
inst.Finalize();
return ires;
inst.SetNotesFiles(argv[i+1]);
}
}