[Compbench-devel] CompBenchmarks++/libcompbenchmarks/Plan Plan.cpp, 1.4, 1.5

[Frederic T. <xf...@us...>]

Update of /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/Plan
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv20572

Modified Files:
	Plan.cpp 
Log Message:
Preliminary usage of CBM::Result

Index: Plan.cpp
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/Plan/Plan.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Plan.cpp	25 Jan 2007 22:08:46 -0000	1.4
--- Plan.cpp	5 Feb 2007 20:05:14 -0000	1.5
***************
*** 14,17 ****
--- 14,18 ----
  #include <Base/Config.h>
  #include <Base/XML.h>
+ #include <Base/Result.h>
  
  using namespace CBM;
***************
*** 293,296 ****
--- 294,303 ----
    CBM::Benchmark *B;
    CBM::Package   *P;
+   std::string    bmValue;
+   std::string    buildTime;
+   std::string    executionTime;
+   std::string    tested;
+   std::string    testOk;
+   CBM::Result    *result;
  
    if (currentIteration()>=totalIterations()) {
***************
*** 303,310 ****
  
    if (!simule) {
      O=new CBM::CompilerOptions(o);
      P->Configure(C, O);
!     P->Make();
!     B->Bench();
      delete(O);
    }
--- 310,338 ----
  
    if (!simule) {
+     bmValue="0";
+     buildTime="0";
+     executionTime="0";
+     tested="0";
+     testOk="0";
+ 
      O=new CBM::CompilerOptions(o);
      P->Configure(C, O);
!     if (P->Make()) {
!       buildTime=P->buildTime();
!       if (P->hasTest()) {
! 	tested="1";
!       }
! 
!       if (P->Test()) {
! 	testOk="1";
!       }
! 
!       bmValue=B->Bench();
!     }
!     result=new CBM::Result(bmValue,
! 			   buildTime,
! 			   executionTime,
! 			   tested,
! 			   testOk);
      delete(O);
    }