[Compbench-devel] CompBenchmarks++/libcompbenchmarks/Benchmark Benchmark.cpp, 1.11, 1.12 Benchmark.h, 1.6, 1.7

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

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

Modified Files:
	Benchmark.cpp Benchmark.h 
Log Message:
Bench() changed : it now calls Clean(), Configure() and Make(); methods if needed.

Index: Benchmark.h
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/Benchmark/Benchmark.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Benchmark.h	17 May 2007 14:29:12 -0000	1.6
--- Benchmark.h	6 Jun 2007 21:36:28 -0000	1.7
***************
*** 71,75 ****
       *  \sa executionTime()
       *  \sa status */
!     virtual std::string Bench(void);
      
      /** Give execution time.
--- 71,76 ----
       *  \sa executionTime()
       *  \sa status */
!     virtual std::string Bench(Compiler *C,
! 			      CompilerOptions *O);
      
      /** Give execution time.

Index: Benchmark.cpp
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/libcompbenchmarks/Benchmark/Benchmark.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** Benchmark.cpp	6 Jun 2007 15:59:47 -0000	1.11
--- Benchmark.cpp	6 Jun 2007 21:36:28 -0000	1.12
***************
*** 52,61 ****
  }
  
! std::string Benchmark::Bench(void)
  {
!   std::string r;
!   std::string info;
!   double      end;
!   char        tmp[128];
  
    cbmUI->msgBench(Name());
--- 52,80 ----
  }
  
! std::string Benchmark::Bench(Compiler *C,
! 			     CompilerOptions *O)
  {
!   std::string          r;
!   std::string          info;
!   double               end;
!   char                 tmp[128];
! 
!   int                  p_cm;
!   CBM::Package::Status p_status;
! 
!   cbmUI->msgGroup("Benchmark");
! 
!   p_cm=Package()->ContextMatches(C, O);
! 
!   p_status=Package()->getStatus();
!   if ((p_status>=CBM::Package::Configured) && (!p_cm)) {
!     Package()->Release();
!   }
!     
!   if (!p_cm) {
!     Package()->Configure(C, O);
!     Package()->Make(UO_force);
!     Package()->Test(UO_force);
!   }
  
    cbmUI->msgBench(Name());
***************
*** 65,68 ****
--- 84,88 ----
      info+=" not tested !";
      cbmUI->outputKO(info);
+     cbmUI->outputKO(info);
      return("0");
    }
***************
*** 85,88 ****
--- 105,109 ----
      cbmUI->outputInfo(i_r);
      cbmUI->outputOK();
+     cbmUI->outputOK();
    } else {
      cbmUI->outputKO();
***************
*** 90,93 ****
--- 111,115 ----
      info+=Package()->Name();
      cbmUI->msgFatal(info);
+     cbmUI->outputKO();
    }