compbench-devel

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

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

Modified Files:
	02-CBMBenchmarkSelector-public.pl 
	03-CBMCompilerSelector-public.pl 
Log Message:
CBMPackage and new related API used.

Index: 02-CBMBenchmarkSelector-public.pl
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/CBM-PI/t/02-CBMBenchmarkSelector-public.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** 02-CBMBenchmarkSelector-public.pl	28 Dec 2006 18:52:32 -0000	1.3
--- 02-CBMBenchmarkSelector-public.pl	4 Jan 2007 19:37:50 -0000	1.4
***************
*** 10,14 ****
  my @benchmarks = `cat $top_srcdir/../../SupportedBenchmarks/benchmarks.list | grep -v '^#' | cut -f1 -d':'`;
  chomp(@benchmarks);
! plan tests => (@benchmarks+0)*52;
  
  my $sys;
--- 10,14 ----
  my @benchmarks = `cat $top_srcdir/../../SupportedBenchmarks/benchmarks.list | grep -v '^#' | cut -f1 -d':'`;
  chomp(@benchmarks);
! plan tests => (@benchmarks+0)*53;
  
  my $sys;
***************
*** 16,21 ****
  $sys = CBM::Init();
  
- my $BMS = CBM::CBMBenchmarkSelector->new($sys);
  my $b;
  
  my %bm_hash;
--- 16,21 ----
  $sys = CBM::Init();
  
  my $b;
+ my $p;
  
  my %bm_hash;
***************
*** 23,30 ****
  foreach(@benchmarks) {
    print ">$_\n";
!   $b   = $BMS->select($_);
    ok(defined($b), "loading $_");
    if (!defined($b)) {
!     my $N = 14;
      while ($N--) {
        ok(0);
--- 23,30 ----
  foreach(@benchmarks) {
    print ">$_\n";
!   $b   = $sys->Benchmark($_);
    ok(defined($b), "loading $_");
    if (!defined($b)) {
!     my $N = 52;
      while ($N--) {
        ok(0);
***************
*** 32,37 ****
      next;
    }
! 
!   my $s=$b->getStatus();
    ok(defined($s), "status exists for $_");
    ok(($s>=0) && ($s<=8), "valid status for $_ : '$s'");
--- 32,38 ----
      next;
    }
!   $p=$b->Package();
!   ok(defined($p), "package for $_");
!   my $s=$p->getStatus();
    ok(defined($s), "status exists for $_");
    ok(($s>=0) && ($s<=8), "valid status for $_ : '$s'");
***************
*** 39,52 ****
    my $pack = "$_";
    $pack =~ s/^(.*?)-.+/$1/g;
!   ok($pack eq $b->packageName(), "checking packageName() for $_ : '$pack'/" . $b->packageName());
  
!   check_simple($b->packageVersion());
  
!   my $siz = $b->packageSize();
    check_simple($siz);
    ok($siz > 0);
  
!   check_simple($b->packageComments());
!   check_simple($b->localPackageName());
  
    my $bn = $b->benchmarkName();
--- 40,53 ----
    my $pack = "$_";
    $pack =~ s/^(.*?)-.+/$1/g;
!   ok($pack eq $p->packageName(), "checking packageName() for $_ : '$pack'/" . $p->packageName());
  
!   check_simple($p->packageVersion());
  
!   my $siz = $p->packageSize();
    check_simple($siz);
    ok($siz > 0);
  
!   check_simple($p->packageComments());
!   check_simple($p->localPackageName());
  
    my $bn = $b->benchmarkName();
***************
*** 57,71 ****
    check_simple($b->benchmarkComments());
  
!   my $lang = $b->language();
    check_simple($lang);
    ok( ($lang eq "C") || ($lang eq "C++"));
  
!   check_simple($b->license());
  
!   check_simple($b->author());
!   check_simple($b->localPackageAbsoluteName());
!   check_simple($b->localPackageAbsoluteDirectory());
  
!   my $hast = $b->hasTest();
    ok( ($hast==0) || ($hast==1) );
  }
--- 58,72 ----
    check_simple($b->benchmarkComments());
  
!   my $lang = $p->language();
    check_simple($lang);
    ok( ($lang eq "C") || ($lang eq "C++"));
  
!   check_simple($p->license());
  
!   check_simple($p->author());
!   check_simple($p->localPackageAbsoluteName());
!   check_simple($p->localPackageAbsoluteDirectory());
  
!   my $hast = $p->hasTest();
    ok( ($hast==0) || ($hast==1) );
  }

Index: 03-CBMCompilerSelector-public.pl
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/CBM-PI/t/03-CBMCompilerSelector-public.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** 03-CBMCompilerSelector-public.pl	28 Dec 2006 18:52:32 -0000	1.2
--- 03-CBMCompilerSelector-public.pl	4 Jan 2007 19:37:50 -0000	1.3
***************
*** 49,51 ****
--- 49,52 ----
  }
  
+ # !!! CBM::benchmarkNumber("gzip");
  $sys->done();