[Compbench-devel] CompBenchmarks++/libcompbenchmarks/Plan Plan-Batch.cpp, 1.7, 1.8

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

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

Modified Files:
	Plan-Batch.cpp 
Log Message:
Verbosity to None before storing Plan.
Bench() method used instead of Configure(), Make(), etc.

Index: Plan-Batch.cpp
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/Plan/Plan-Batch.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** Plan-Batch.cpp	31 Jul 2007 18:34:44 -0000	1.7
--- Plan-Batch.cpp	31 Jul 2007 20:58:40 -0000	1.8
***************
*** 20,23 ****
--- 20,25 ----
  #include <UI/UI.h>
  
+ #include <libcompbenchmarks.h>
+ 
  using namespace CBM;
  
***************
*** 525,547 ****
      testOk="0";
  
!     P->Configure(C, O);
!     if (P->Make()) {
!       buildTime=P->buildTime();
!       if (P->hasTest()) {
! 	tested="1";
!       }
! 
!       if (P->Test()) {
! 	testOk="1";
!       }
! 
!       // bmValue=B->Bench(C, O); arf. !!!
      }
!     result=new CBM::Result(bmValue,
! 			   buildTime,
! 			   executionTime,
! 			   tested,
! 			   testOk);
!     delete(O);
    } else {
      printf(" Batch %s, iteration %d/%d\n", id.c_str(), currentIteration(), totalIterations());
--- 527,542 ----
      testOk="0";
  
!     if (P->getStatus()<CBM::Package::Preconfigured) {
!       // std::cerr << "Package not properly installed !!!" << std::endl; 
!       return(0);
      }
!     B->Bench(C, O);
!     /*
!       result=new CBM::Result(bmValue,
!       buildTime,
!       executionTime,
!       tested,
!       testOk);
!     */
    } else {
      printf(" Batch %s, iteration %d/%d\n", id.c_str(), currentIteration(), totalIterations());
***************
*** 556,561 ****
    iteration++;
  
!   if (!simule)
      plan->store();
  
    return(currentIteration()<totalIterations());
--- 551,561 ----
    iteration++;
  
!   if (!simule) {
!     Verbosity b = UO_verbose;
! 
!     UO_verbose=CBM::None;
      plan->store();
+     UO_verbose=b;
+   }
  
    return(currentIteration()<totalIterations());