[Compbench-devel] CompBenchmarks++/CBM-PI/t 00-CBMSystem-public.pl, 1.2, 1.3 01-CBMSystem-protected.pl, 1.1, 1.2 02-CBMBenchmarkSelector-public.pl, 1.2, 1.3 03-CBMCompilerSelector-public.pl, 1.1, 1.2

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

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

Modified Files:
	00-CBMSystem-public.pl 01-CBMSystem-protected.pl 
	02-CBMBenchmarkSelector-public.pl 
	03-CBMCompilerSelector-public.pl 
Log Message:
Common code moved to ./lib/

Index: 02-CBMBenchmarkSelector-public.pl
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/CBM-PI/t/02-CBMBenchmarkSelector-public.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** 02-CBMBenchmarkSelector-public.pl	28 Dec 2006 17:41:36 -0000	1.2
--- 02-CBMBenchmarkSelector-public.pl	28 Dec 2006 18:52:32 -0000	1.3
***************
*** 4,9 ****
  use Test::More;
  
! my $top_srcdir = $0;
! $top_srcdir =~ s/(.+)\/.*/$1/;
  
  my @benchmarks = `cat $top_srcdir/../../SupportedBenchmarks/benchmarks.list | grep -v '^#' | cut -f1 -d':'`;
--- 4,10 ----
  use Test::More;
  
! require "libtest.pl";
! 
! our $top_srcdir;
  
  my @benchmarks = `cat $top_srcdir/../../SupportedBenchmarks/benchmarks.list | grep -v '^#' | cut -f1 -d':'`;
***************
*** 13,40 ****
  my $sys;
  
- 
- sub check_simple {
-   my $str = shift;
- 
-   ok($str ne "");
-   if ($str =~ /\n/) {
-     ok(0);
-   } else {
-     ok(1);
-   }
- 
-   if ($str =~ /^ +(.*)/) {
-     ok(0, "'$str' starts with space(s)");
-   } else {
-     ok(1);
-   }
- 
-   if ($str =~ / $/) {
-     ok(0, "'$str' ends with space(s)");
-   } else {
-     ok(1);
-   }
- }
- 
  $sys = CBM::Init();
  
--- 14,17 ----

Index: 00-CBMSystem-public.pl
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/CBM-PI/t/00-CBMSystem-public.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** 00-CBMSystem-public.pl	28 Dec 2006 13:18:17 -0000	1.2
--- 00-CBMSystem-public.pl	28 Dec 2006 18:52:32 -0000	1.3
***************
*** 3,11 ****
  use CBM;
  
  use Test::Simple tests => 34;
  
  my $sys;
! my $top_srcdir = $0;
! $top_srcdir =~ s/(.+)\/.*/$1/;
  
  sub test_Split {
--- 3,12 ----
  use CBM;
  
+ require "libtest.pl";
+ 
  use Test::Simple tests => 34;
  
  my $sys;
! our $top_srcdir;
  
  sub test_Split {

Index: 01-CBMSystem-protected.pl
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/CBM-PI/t/01-CBMSystem-protected.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** 01-CBMSystem-protected.pl	28 Dec 2006 00:39:28 -0000	1.1
--- 01-CBMSystem-protected.pl	28 Dec 2006 18:52:32 -0000	1.2
***************
*** 3,34 ****
  use CBM;
  
  use Test::Simple tests => 40;
  
  my $sys;
! my $top_srcdir = $0;
! $top_srcdir =~ s/(.+)\/.*/$1/;
! 
! sub check_simple {
!   my $str = shift;
! 
!   ok($str ne "");
!   if ($str =~ /\n/) {
!     ok(0);
!   } else {
!     ok(1);
!   }
! 
!   if ($str =~ /^ +(.*)/) {
!     ok(0, "'$str' starts with space(s)");
!   } else {
!     ok(1);
!   }
! 
!   if ($str =~ / $/) {
!     ok(0, "'$str' ends with space(s)");
!   } else {
!     ok(1);
!   }
! }
  
  # !!! TODO ???
--- 3,12 ----
  use CBM;
  
+ require "libtest.pl";
+ 
  use Test::Simple tests => 40;
  
  my $sys;
! our $top_srcdir;
  
  # !!! TODO ???

Index: 03-CBMCompilerSelector-public.pl
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/CBM-PI/t/03-CBMCompilerSelector-public.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** 03-CBMCompilerSelector-public.pl	28 Dec 2006 18:36:02 -0000	1.1
--- 03-CBMCompilerSelector-public.pl	28 Dec 2006 18:52:32 -0000	1.2
***************
*** 4,9 ****
  use Test::More;
  
! my $top_srcdir = $0;
! $top_srcdir =~ s/(.+)\/.*/$1/;
  
  my $sys;
--- 4,10 ----
  use Test::More;
  
! require "libtest.pl";
! 
! our $top_srcdir;
  
  my $sys;
***************
*** 30,56 ****
  
  plan tests => (keys %references)*4;
- 		  
- sub check_simple {
-   my $str = shift;
- 
-   ok($str ne "");
-   if ($str =~ /\n/) {
-     ok(0);
-   } else {
-     ok(1);
-   }
- 
-   if ($str =~ /^ +(.*)/) {
-     ok(0, "'$str' starts with space(s)");
-   } else {
-     ok(1);
-   }
- 
-   if ($str =~ / $/) {
-     ok(0, "'$str' ends with space(s)");
-   } else {
-     ok(1);
-   }
- }
  
  $sys = CBM::Init();
--- 31,34 ----