[Compbench-devel] CompBenchmarks++/CBM-PI/t 03-CBMCompilerSelector-public.pl, 1.8, 1.9

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

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

Modified Files:
	03-CBMCompilerSelector-public.pl 
Log Message:
Interface parameters moved in ./lib/compilers.pl

Index: 03-CBMCompilerSelector-public.pl
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/CBM-PI/t/03-CBMCompilerSelector-public.pl,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** 03-CBMCompilerSelector-public.pl	17 Apr 2007 20:08:08 -0000	1.8
--- 03-CBMCompilerSelector-public.pl	18 Apr 2007 16:30:01 -0000	1.9
***************
*** 12,16 ****
--- 12,18 ----
  use Test::More;
  
+ push(@INC, "lib");
  require "libtest.pl";
+ require "compilers.pl";
  
  our $top_srcdir;
***************
*** 18,58 ****
  my $sys;
  
! my %supportedVersions = ('g++' => '2.95.x 3.0.x 3.1.x',
! 			 'gcc' => '2.95.x 3.0.x 3.1.x',
! 			 'tcc' => '0.9.x');
  
! my %references = ('compiler-fake-g++-4.1.1-13' =>
! 		  {'language' => 'C++',
! 		   'compiler' => 'g++',
! 		   'compilerName' => 'g++ (GCC) 4.1.2 20060901 (prerelease) (Debian 4.1.1-13)',
! 		   'compilerVersion' => '4.1.2 20060901 (prerelease)',
! 		   'vanilla' => '4.1.2',
! 		   'compatibility' => '3.1.x'
! 		  },
! 		  'compiler-fake-gcc-3.2.3-20-rh' =>
! 		  {'language' => 'C',
! 		   'compiler' => 'gcc',
! 		   'compilerName' => 'gcc (GCC) 3.2.3 20030502 (Red Hat Linux 3.2.3-20)',
! 		   'compilerVersion' => '3.2.3',
! 		   'vanilla' => '3.2.3',
! 		   'compatibility' => '3.1.x'
! 		  },
! 		  'compiler-fake-gcc-4.1.1-13' =>
! 		  {'language' => 'C',
! 		   'compiler' => 'gcc',
!  		   'compilerName' => 'gcc (GCC) 4.1.2 20060901 (prerelease) (Debian 4.1.1-13)',
!  		   'compilerVersion' => '4.1.2 20060901 (prerelease)',
! 		   'vanilla' => '4.1.2',
! 		   'compatibility' => '3.1.x'
! 		  },
! 		  'compiler-fake-tcc-0.9.23',
! 		  {'language' => 'C',
! 		   'compiler' => 'tcc',
!  		   'compilerName' => 'Tiny C Compiler tcc version 0.9.23',
!  		   'compilerVersion' => 'tcc version 0.9.23',
! 		   'vanilla' => '0.9.23',
! 		   'compatibility' => '0.9.x'
! 		  }
! 		 );
  
  sub checkSupportedVersion {
--- 20,47 ----
  my $sys;
  
! our @COMPILER_FAKE_INTERFACES;
! our %COMPILER_FAKE_INTERFACES;
! our %COMPILER_FAKE_INTERFACE_PARAMETERS;
  
! my %supportedVersions;
! # = ('g++' => '2.95.x 3.0.x 3.1.x',
! #			 'gcc' => '2.95.x 3.0.x 3.1.x',
! #			 'tcc' => '0.9.x');
! 
! sub initSupportedVersions {
!   my $cfi;
!   my $rec;
! 
!   foreach $cfi (@COMPILER_FAKE_INTERFACES) {
!     $rec=$COMPILER_FAKE_INTERFACES{$cfi};
!     if ($rec =~ /(.*?)-(.*)/) {
!       my $cid    = $1;
!       my $branch = $2;
!       $supportedVersions{$cid}.="$branch ";
!     }
!   }
!   foreach(keys %supportedVersions) {
!   }
! }
  
  sub checkSupportedVersion {
***************
*** 73,77 ****
  }
  
! plan tests => (keys %references)*7;
  
  $sys = CBM::Init();
--- 62,66 ----
  }
  
! plan tests => (keys %COMPILER_FAKE_INTERFACE_PARAMETERS)*7;
  
  $sys = CBM::Init();
***************
*** 81,88 ****
  my $co;
  my %refdata;
  
! foreach $reffile (keys %references) {
    $co=$CS->select("$top_srcdir/reference/$reffile");
!   %refdata=%{$references{$reffile}};
  
    ok($refdata{language} eq $co->Language(), "$reffile: Language is $refdata{language}");
--- 70,78 ----
  my $co;
  my %refdata;
+ initSupportedVersions();
  
! foreach $reffile (keys %COMPILER_FAKE_INTERFACE_PARAMETERS) {
    $co=$CS->select("$top_srcdir/reference/$reffile");
!   %refdata=%{$COMPILER_FAKE_INTERFACE_PARAMETERS{$reffile}};
  
    ok($refdata{language} eq $co->Language(), "$reffile: Language is $refdata{language}");