[Cmake-commits] [cmake-commits] hoffman committed cmCTestTestHandler.cxx 1.82 1.83 cmCTestTestHandler.h 1.30 1.31

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Source/CTest
In directory public:/mounts/ram/cvs-serv7469

Modified Files:
	cmCTestTestHandler.cxx cmCTestTestHandler.h 
Log Message:
BUG: partial fix for #8056


Index: cmCTestTestHandler.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CTest/cmCTestTestHandler.cxx,v
retrieving revision 1.82
retrieving revision 1.83
diff -C 2 -d -r1.82 -r1.83
*** cmCTestTestHandler.cxx	26 Nov 2008 19:38:43 -0000	1.82
--- cmCTestTestHandler.cxx	19 Dec 2008 02:59:25 -0000	1.83
***************
*** 1177,1180 ****
--- 1177,1215 ----
        p.Depends.push_back(line);
        }
+     int numErrRegex = 0;
+     ok = ok && this->GetValue("ErrorRegularExpressions:", 
+                               numErrRegex, fin);
+     for(int i =0; i < numErrRegex; i++)
+       {
+       cmSystemTools::GetLineFromStream(fin, line);
+       std::pair<cmsys::RegularExpression, std::string> rpair;
+       rpair.first.compile(line.c_str());
+       rpair.second = line;
+       p.ErrorRegularExpressions.push_back(rpair);
+       }
+     int numReqRegex = 0;
+     ok = ok && this->GetValue("RequiredRegularExpressions:", 
+                               numReqRegex, fin);
+     for(int i =0; i < numReqRegex; i++)
+       {
+       cmSystemTools::GetLineFromStream(fin, line);
+       std::pair<cmsys::RegularExpression, std::string> rpair;
+       rpair.first.compile(line.c_str());
+       rpair.second = line;
+       p.RequiredRegularExpressions.push_back(rpair);
+       }
+     int numMeasure = 0;
+     ok = ok && this->GetValue("Measurements:", 
+                               numMeasure, fin);
+     for(int i =0; i < numMeasure; i++)
+       {
+       cmStdString m;
+       cmStdString v;
+       cmSystemTools::GetLineFromStream(fin, line);
+       m = line;
+       cmSystemTools::GetLineFromStream(fin, line);
+       v = line;
+       p.Measurements[m] = v;
+       }
      int isinre;
      ok = ok && this->GetValue("IsInBasedOnREOptions:", isinre, fin);
***************
*** 1182,1187 ****
--- 1217,1233 ----
      ok = ok && this->GetValue("TimeOut:", p.Timeout, fin);
      ok = ok && this->GetValue("Index:", p.Index, fin);
+     int numEnv = 0;
+     ok = ok && this->GetValue("Environment:", 
+                               numEnv, fin);
+     for(int i =0; i < numEnv; i++)
+       {
+       cmSystemTools::GetLineFromStream(fin, line);
+       p.Environment.push_back(line);
+       }
      if(!ok)
        {
+       cmCTestLog(this->CTest, ERROR_MESSAGE,
+                  "Internal Error reading cached test information."
+                  << std::endl);
        return;
        }
***************
*** 1231,1234 ****
--- 1277,1305 ----
        fout << i->c_str() << "\n";
        }
+     std::vector<std::pair<cmsys::RegularExpression,
+       std::string> >::iterator regxi;
+     fout << "ErrorRegularExpressions:\n" << 
+       p.ErrorRegularExpressions.size() << "\n";
+     for(regxi  = p.ErrorRegularExpressions.begin(); 
+         regxi != p.ErrorRegularExpressions.end(); regxi++)
+       {
+       fout << regxi->second << "\n";
+       }
+     fout << "RequiredRegularExpressions:\n" << 
+       p.RequiredRegularExpressions.size() << "\n";
+     for(regxi  = p.RequiredRegularExpressions.begin(); 
+         regxi != p.RequiredRegularExpressions.end(); regxi++)
+       {
+       fout << regxi->second << "\n";
+       }
+     fout << "Measurements:\n" << 
+       p.Measurements.size() << "\n";
+     for(std::map<cmStdString, cmStdString>::const_iterator m =
+           p.Measurements.begin(); m != p.Measurements.end(); ++m)
+       {
+       fout << m->first << "\n";
+       fout << m->second << "\n";
+       }
+ 
      fout << "IsInBasedOnREOptions:\n"
           << p.IsInBasedOnREOptions
***************
*** 1239,1242 ****
--- 1310,1320 ----
           << "\nIndex:\n"
           << p.Index << "\n";
+     fout << "Environment:\n" << 
+       p.Environment.size() << "\n";
+     for(std::vector<std::string>::const_iterator e =
+           p.Environment.begin(); e != p.Environment.end(); ++e)
+       {
+       fout << *e << "\n";
+       }
      }
    fout.close();

Index: cmCTestTestHandler.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CTest/cmCTestTestHandler.h,v
retrieving revision 1.30
retrieving revision 1.31
diff -C 2 -d -r1.30 -r1.31
*** cmCTestTestHandler.h	26 Nov 2008 19:38:43 -0000	1.30
--- cmCTestTestHandler.h	19 Dec 2008 02:59:25 -0000	1.31
***************
*** 76,79 ****
--- 76,83 ----
    void Initialize();
  
+   // NOTE: This struct is Saved/Restored
+   // in cmCTestTestHandler, if you add to this class
+   // then you must add the new members to that code or
+   // ctest -j N will break for that feature
    struct cmCTestTestProperties
    {