[Compbench-devel] CompBenchmarks++/CBM-PI/t 02-CBMSystem-benchs.pl, 1.6, 1.7 05-Plan.pl, 1.4, 1.5

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

Update of /cvsroot/compbench/CompBenchmarks++/CBM-PI/t
In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv5287

Modified Files:
	02-CBMSystem-benchs.pl 05-Plan.pl 
Log Message:
More tests.

Index: 02-CBMSystem-benchs.pl
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/CBM-PI/t/02-CBMSystem-benchs.pl,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** 02-CBMSystem-benchs.pl	21 Jan 2007 21:27:51 -0000	1.6
--- 02-CBMSystem-benchs.pl	26 Jan 2007 13:09:57 -0000	1.7
***************
*** 9,14 ****
  
  my @benchmarks = `cat $top_srcdir/../../SupportedBenchmarks/benchmarks.list | grep -v '^#' | cut -f1 -d':'`;
  chomp(@benchmarks);
! plan tests => ((@benchmarks+0)*59);
  
  my $sys;
--- 9,24 ----
  
  my @benchmarks = `cat $top_srcdir/../../SupportedBenchmarks/benchmarks.list | grep -v '^#' | cut -f1 -d':'`;
+ my @a_packages = `cat $top_srcdir/../../SupportedBenchmarks/benchmarks.list | grep -v '^#' | cut -f1 -d':' | cut -f1 -d'-'`;
+ 
  chomp(@benchmarks);
! chomp(@a_packages);
! 
! my %packages;
! foreach(@a_packages) {
!   $packages{$_}=1;
! }
! my @packages = keys %packages;
! 
! plan tests => ((@benchmarks+0)*61);
  
  my $sys;
***************
*** 22,26 ****
  
  foreach(@benchmarks) {
-   print ">$_\n";
    $b   = $sys->Benchmark($_);
    ok(defined($b), "loading $_");
--- 32,35 ----
***************
*** 32,36 ****
      next;
    }
! 
    $p=$b->Package();
    ok(defined($p), "package for $_");
--- 41,45 ----
      next;
    }
!   $bm_hash{$_}=1;
    $p=$b->Package();
    ok(defined($p), "package for $_");
***************
*** 80,82 ****
--- 89,110 ----
  }
  
+ my $i;
+ my $n;
+ my $pid;
+ 
+ foreach $pid (@packages) {
+   $p=$sys->Package($pid);
+ 
+   $n=$p->benchmarkNumber();
+   for($i=0;$i<$n;$i++) {
+     $b=$p->Benchmark($i);
+     ok(defined($b->Name()));
+     $bm_hash{$b->Name()}++;
+   }
+ }
+ 
+ foreach(keys %bm_hash) {
+   ok($bm_hash{$_}==2, "hash $_ is 2 ($bm_hash{$_})");
+ }
+ 
  $sys->done();

Index: 05-Plan.pl
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/CBM-PI/t/05-Plan.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** 05-Plan.pl	25 Jan 2007 22:09:39 -0000	1.4
--- 05-Plan.pl	26 Jan 2007 13:09:57 -0000	1.5
***************
*** 6,10 ****
  require "libtest.pl";
  
! use Test::Simple tests => 136;
  
  my $sys;
--- 6,10 ----
  require "libtest.pl";
  
! use Test::Simple tests => 137;
  
  my $sys;
***************
*** 114,118 ****
  
    $X=$R->read("$top_srcdir/reference/plan.xml");
!   $P->restore($X);
  
    my $x = `cat $top_srcdir/reference/plan.xml`;
--- 114,118 ----
  
    $X=$R->read("$top_srcdir/reference/plan.xml");
!   ok($P->restore($X) == 1);
  
    my $x = `cat $top_srcdir/reference/plan.xml`;