[test] ignore TEST_PROG_ARGS -O2 for opt1.t tests

parrot · Mar 5, 2014 · 9117768 · 9117768
1 parent b22e4c6
commit 9117768
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/lib/Parrot/Test.pm b/lib/Parrot/Test.pm
@@ -964,10 +964,17 @@ sub _generate_test_functions {
             # mangle windows line endings
             convert_line_endings($expected);
 
+            my $args = $ENV{TEST_PROG_ARGS} || '';
             if ($func =~ /^pir_2_/) {
                 $opt  = $code_basef =~ m!opt(.)! ? "-O$1" : "-O1";
+                $args =~ s/-O[012pc]//;
+                if ($code_basef =~ m!opt(.)!) {
+                    $opt = "-O$1";
+                }
+                else {
+                    $opt = "-O1";
+                }
             }
-            my $args = $ENV{TEST_PROG_ARGS} || '';
             $args   .= " $opt -d1000 -o $out_f.tmp";
             $args    =~ s/--run-exec//;
             $cmd       = qq{$parrot $args "$code_f"};