Ticket #403: more_tests.patch

lib/Parrot/Harness/Options.pm

@@ -94 +94 @@
         'S' => '-runcore=switch',
         'b' => '-runcore=bounds',
         'f' => '-runcore=fast',
+        'r' => '-run-pbc',
     );
 
     my %mapped;

t/pmc/sub.t

@@ -892 +892 @@
 ok
 OUTPUT
 
-{
-
-    # the test has different output when run with --run-pbc (make testr)
-    # actually not - compiling creates 2 'initial'
-    #                running emts 'main'
-
-    my $code = <<'CODE';
+pir_output_is( <<'CODE', <<'OUT', ':immediate :postcomp' );
 .sub optc :immediate :postcomp
     print "initial\n"
 .end
@@ -906 +900 @@
     say "main"
 .end
 CODE
-    my $descr = ':immediate :postcomp';
-    if ( exists $ENV{TEST_PROG_ARGS} and $ENV{TEST_PROG_ARGS} =~ m/-r/ ) {
-        pir_output_is( $code, <<'OUT', $descr );
 initial
 initial
 main
 OUT
-    }
-    else {
-        pir_output_is( $code, <<'OUT', $descr );
-initial
-initial
-main
-OUT
-    }
-}
 
 pir_output_like( <<'CODE', <<'OUTPUT', ':anon' );
 .sub main :main

t/pmc/namespace.t

@@ -645 +645 @@
 
 SKIP:
 {
-    skip( "immediate test, doesn't with -r (from .pbc)", 1 )
-        if ( exists $ENV{TEST_PROG_ARGS} and $ENV{TEST_PROG_ARGS} =~ m/-r/ );
+    skip( "immediate test, doesn't with --run-pbc", 1 )
+        if ( exists $ENV{TEST_PROG_ARGS} and $ENV{TEST_PROG_ARGS} =~ m/--run-pbc/ );
 
     pir_output_is( <<'CODE', <<'OUTPUT', "get_global in current" );
 .HLL 'bork'

t/pmc/exception.t

@@ -535 +535 @@
 OUTPUT
 
 $ENV{TEST_PROG_ARGS} ||= '';
-my @todo = $ENV{TEST_PROG_ARGS} =~ /-r/
+my @todo = $ENV{TEST_PROG_ARGS} =~ /--run-pbc/
     ? ( todo => '.tailcall and lexical maps not thawed from PBC, RT #60650' )
     : ();
 pir_output_is( <<'CODE', <<'OUTPUT', "exit_handler via exit exception", @todo );

t/compilers/imcc/syn/hll.t

@@ -33 +33 @@
 OUT
 
 $ENV{TEST_PROG_ARGS} ||= '';
-my @todo = $ENV{TEST_PROG_ARGS} =~ /-r/
+my @todo = $ENV{TEST_PROG_ARGS} =~ /--run-pbc/
     ? ( todo => 'classes and HLL maps not thawed from PBC, RT #60648' )
     : ();
 pir_output_is( <<'CODE', <<'OUT', ".param :slurpy (using object)", @todo );

t/compilers/imcc/syn/errors.t

@@ -11 +11 @@
 use Parrot::Test;
 
 plan skip_all => 'No reason to compile invalid PBC here'
-    if $ENV{TEST_PROG_ARGS} && $ENV{TEST_PROG_ARGS} =~ m/-r/;
+    if $ENV{TEST_PROG_ARGS} && $ENV{TEST_PROG_ARGS} =~ m/--run-pbc/;
 
 plan tests => 5;
 

t/op/exceptions.t

@@ -424 +424 @@
 OUTPUT
 
 $ENV{TEST_PROG_ARGS} ||= '';
-my @todo = $ENV{TEST_PROG_ARGS} =~ /-r/
+my @todo = $ENV{TEST_PROG_ARGS} =~ /--run-pbc/
     ? ( todo => '.tailcall and lexical maps not thawed from PBC, RT #60650' )
     : ();
 pir_output_is( <<'CODE', <<'OUTPUT', "exit_handler via exit exception", @todo );

t/op/lexicals.t

@@ -12 +12 @@
 $ENV{TEST_PROG_ARGS} ||= '';
 
 plan( skip_all => 'lexicals not thawed properly from PBC, RT #60652' )
-    if $ENV{TEST_PROG_ARGS} =~ /-r/;
+    if $ENV{TEST_PROG_ARGS} =~ /--run-pbc/;
 
 plan( tests => 47 );