[svn:parrot] r26627 - trunk/lib/Parrot

[infinoid]

Author: infinoid
Date: Sat Mar 29 12:19:42 2008
New Revision: 26627

Modified:
   trunk/lib/Parrot/Test.pm

Log:
[Parrot::Test]
* parse for -O arguments in the filename, not leading directories
* This fixes RT #52224.  tetragon++  kid51++


Modified: trunk/lib/Parrot/Test.pm
==============================================================================
--- trunk/lib/Parrot/Test.pm    (original)
+++ trunk/lib/Parrot/Test.pm    Sat Mar 29 12:19:42 2008
@@ -263,6 +263,7 @@
 
 use Cwd;
 use File::Spec;
+use File::Basename;
 use Memoize ();
 
 use Parrot::Config;
@@ -575,6 +576,7 @@
         die "Unknown test function: $func";
     }
     $code_f = File::Spec->rel2abs($code_f);
+    my $code_basef = basename($code_f);
 
     # native tests are just run, others need to write code first
     if ( $code_f !~ /\.pbc$/ ) {
@@ -583,7 +585,7 @@
 
     # honor opt* filename to actually run code with -Ox
     my $args = $ENV{TEST_PROG_ARGS} || '';
-    my $opt = $code_f =~ m!opt(.)! ? "-O$1" : "";
+    my $opt = $code_basef =~ m!opt(.)! ? "-O$1" : "";
     $args .= " $opt";
 
     my $run_exec = 0;
@@ -766,11 +768,12 @@
 
             # Name of the file with test code.
             my $code_f = File::Spec->rel2abs( per_test( '.pir', $test_no ) );
+            my $code_basef = basename($code_f);
 
             # output file
             my $out_f = per_test( '.pasm', $test_no );
 
-            my $opt = $code_f =~ m!opt(.)! ? "-O$1" : "-O1";
+            my $opt = $code_basef =~ m!opt(.)! ? "-O$1" : "-O1";
             my $args = $ENV{TEST_PROG_ARGS} || '';
             $args .= " $opt --output=$out_f";
             $args =~ s/--run-exec//;