[Compbench-devel] CompBenchmarks++/Benchmark Benchmark-BZIP2.cpp, 1.2, 1.3 Benchmark-BZIP2.h, 1.2, 1.3 Benchmark-GZIP.cpp, 1.3, 1.4 Benchmark-GZIP.h, 1.3, 1.4

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

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

Modified Files:
	Benchmark-BZIP2.cpp Benchmark-BZIP2.h Benchmark-GZIP.cpp 
	Benchmark-GZIP.h 
Log Message:
Items for package testing (once built, and before benchmarking); disabled for now.

Index: Benchmark-GZIP.h
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/Benchmark/Benchmark-GZIP.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Benchmark-GZIP.h	19 Sep 2006 17:09:35 -0000	1.3
--- Benchmark-GZIP.h	3 Oct 2006 15:48:36 -0000	1.4
***************
*** 32,35 ****
--- 32,38 ----
  
   protected:
+   virtual int hasTest(void);
+   virtual int test(void);
+ 
   public:
    CBMBenchmarkGZIP(class CBMSystem *_system);

Index: Benchmark-GZIP.cpp
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/Benchmark/Benchmark-GZIP.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Benchmark-GZIP.cpp	20 Sep 2006 16:51:27 -0000	1.3
--- Benchmark-GZIP.cpp	3 Oct 2006 15:48:36 -0000	1.4
***************
*** 4,7 ****
--- 4,9 ----
  #include <fstream>
  
+ #include <config.h>
+ 
  CBMBenchmarkGZIP::CBMBenchmarkGZIP(CBMSystem *_system)
    : CBMBenchmarkxZIP(_system)
***************
*** 49,52 ****
--- 51,73 ----
  }
  
+ int CBMBenchmarkGZIP::hasTest(void)
+ {
+   return(0);
+ }
+ 
+ int CBMBenchmarkGZIP::test(void)
+ {
+   std::string cmd;
+   std::string sstdout;
+ 
+   cmd="cd ";
+   cmd+=localPackageAbsoluteDirectory();
+   cmd+=" && ";
+   cmd+=CBM_PROG_MAKE;
+   cmd+=" test 2> /dev/null";
+ 
+   return(system->exec(cmd, sstdout)==0);
+ }
+ 
  char* CBMBenchmarkGZIP::extractDirectory(void)
  {

Index: Benchmark-BZIP2.h
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/Benchmark/Benchmark-BZIP2.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Benchmark-BZIP2.h	2 Oct 2006 16:27:36 -0000	1.2
--- Benchmark-BZIP2.h	3 Oct 2006 15:48:36 -0000	1.3
***************
*** 32,35 ****
--- 32,37 ----
  
   protected:
+   virtual int hasTest(void);
+   virtual int test(void);
   public:
    CBMBenchmarkBZIP2(class CBMSystem *_system);

Index: Benchmark-BZIP2.cpp
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/Benchmark/Benchmark-BZIP2.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Benchmark-BZIP2.cpp	2 Oct 2006 19:33:57 -0000	1.2
--- Benchmark-BZIP2.cpp	3 Oct 2006 15:48:36 -0000	1.3
***************
*** 95,98 ****
--- 95,117 ----
  }
  
+ int CBMBenchmarkBZIP2::hasTest(void)
+ {
+   return(0);
+ }
+ 
+ int CBMBenchmarkBZIP2::test(void)
+ {
+   std::string cmd;
+   std::string sstdout;
+ 
+   cmd="cd ";
+   cmd+=localPackageAbsoluteDirectory();
+   cmd+=" && ";
+   cmd+=CBM_PROG_MAKE;
+   cmd+=" check 2> /dev/null";
+ 
+   return(system->exec(cmd, sstdout)==0);
+ }
+ 
  char* CBMBenchmarkBZIP2::extractDirectory(void)
  {