[Compbench-devel] CompBenchmarks++/CBM-PI/t 05-CEL.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-serv20668

Modified Files:
	05-CEL.pl 
Log Message:
<cel-function-return/> obsoleted.
<cel-cmp-ae/> fixed.

Index: 05-CEL.pl
===================================================================
RCS file: /cvsroot/compbench/CompBenchmarks++/CBM-PI/t/05-CEL.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** 05-CEL.pl	8 Mar 2007 17:15:10 -0000	1.4
--- 05-CEL.pl	11 Mar 2007 18:46:06 -0000	1.5
***************
*** 8,12 ****
  require "libtest.pl";
  
! use Test::Simple tests => 138;
  
  our $top_srcdir;
--- 8,12 ----
  require "libtest.pl";
  
! use Test::Simple tests => 137;
  
  our $top_srcdir;
***************
*** 190,194 ****
      $eq2->add($V1);
  
!     ok($eq2->Evaluate() eq "1", "ae on ($v0, $v1) returns T");
  
      my $eq3 = new CBM::CelCmpAE();
--- 190,194 ----
      $eq2->add($V1);
  
!     ok($eq2->Evaluate() eq "0", "ae on ($v0, $v1) returns F");
  
      my $eq3 = new CBM::CelCmpAE();
***************
*** 198,202 ****
      $eq3->add($V1);
  
!     ok($eq3->Evaluate() eq "0", "ae on ($v1, $v0) returns F");
    }
  }
--- 198,202 ----
      $eq3->add($V1);
  
!     ok($eq3->Evaluate() eq "1", "ae on ($v1, $v0) returns T");
    }
  }
***************
*** 509,539 ****
  }
  
! sub test_function_return {
!   my $e;
  
!   my $fd = new CBM::CelFunctionDef();
!   my $fn = new CBM::CelStr("func2");
!   $fd->add($fn);
  
!   my $r0 = new CBM::CelFunctionReturn();
!   my $v0 = new CBM::CelStr("v0");
!   $r0->add($v0);
  
!   my $r1 = new CBM::CelFunctionReturn();
!   my $v1 = new CBM::CelStr("v1");
!   $r1->add($v1);
  
!   $fd->add($r0);
!   $fd->add($r1);
  
!   $fd->Evaluate();
  
!   my $fc = new CBM::CelFunctionCall();
!   my $cn = new CBM::CelStr("func2");
!   $fc->add($cn);
  
!   $e = $fc->Evaluate();
!   ok($e eq "v0", "func2() returns v0 (has $e)");
! }
  
  sub test_loop_break {
--- 509,539 ----
  }
  
! #sub test_function_return {
! #  my $e;
  
! #  my $fd = new CBM::CelFunctionDef();
! #  my $fn = new CBM::CelStr("func2");
! #  $fd->add($fn);
  
! #  my $r0 = new CBM::CelFunctionReturn();
! #  my $v0 = new CBM::CelStr("v0");
! #  $r0->add($v0);
  
! #  my $r1 = new CBM::CelFunctionReturn();
! #  my $v1 = new CBM::CelStr("v1");
! #  $r1->add($v1);
  
! #  $fd->add($r0);
! #  $fd->add($r1);
  
! #  $fd->Evaluate();
  
! #  my $fc = new CBM::CelFunctionCall();
! #  my $cn = new CBM::CelStr("func2");
! #  $fc->add($cn);
  
! #  $e = $fc->Evaluate();
! #  ok($e eq "v0", "func2() returns v0 (has $e)");
! #}
  
  sub test_loop_break {
***************
*** 674,678 ****
  test_block();
  test_function();
! test_function_return();
  test_loop_break();
  test_loop();
--- 674,678 ----
  test_block();
  test_function();
! # test_function_return();
  test_loop_break();
  test_loop();