[svn:parrot] r48815 - in trunk/t: op pmc

[plobsing at svn.parrot.org]

Author: plobsing
Date: Mon Sep  6 20:21:36 2010
New Revision: 48815
URL: https://trac.parrot.org/parrot/changeset/48815

Log:
same capture_lex fix as in r48813

Modified:
   trunk/t/op/exceptions.t
   trunk/t/pmc/exception-old.t

Modified: trunk/t/op/exceptions.t
==============================================================================
--- trunk/t/op/exceptions.t	Mon Sep  6 20:16:07 2010	(r48814)
+++ trunk/t/op/exceptions.t	Mon Sep  6 20:21:36 2010	(r48815)
@@ -423,19 +423,7 @@
 No exception handler/
 OUTPUT
 
-$ENV{TEST_PROG_ARGS} ||= '';
-my @todo = $ENV{TEST_PROG_ARGS} =~ /--run-pbc/
-    ? ( todo => '.tailcall and lexical maps not thawed from PBC, TT #1172' )
-    : ();
-#
-# this test is hanging in testr since pcc_hackathon_6Mar10 branch merge at r45108
-# converting to skip at the moment
-#
-
-SKIP: {
-    skip ".tailcall and lexical maps not thawed from PBC - hangs", 1 if @todo;
-
-pir_output_is( <<'CODE', <<'OUTPUT', "exit_handler via exit exception", @todo );
+pir_output_is( <<'CODE', <<'OUTPUT', "exit_handler via exit exception" );
 .sub main :main
     .local pmc a
     .lex 'a', a
@@ -444,7 +432,9 @@
     push_eh handler
     exit 0
 handler:
-    .tailcall exit_handler()
+    .const 'Sub' $P0 = 'exit_handler'
+    capture_lex $P0
+    .tailcall $P0()
 .end
 
 .sub exit_handler :outer(main)
@@ -459,8 +449,6 @@
 a = 42
 OUTPUT
 
-}
-
 ## Regression test for r14697.  This probably won't be needed when PDD23 is
 ## fully implemented.
 pir_error_output_like( <<'CODE', <<'OUTPUT', "invoke handler in calling sub" );

Modified: trunk/t/pmc/exception-old.t
==============================================================================
--- trunk/t/pmc/exception-old.t	Mon Sep  6 20:16:07 2010	(r48814)
+++ trunk/t/pmc/exception-old.t	Mon Sep  6 20:21:36 2010	(r48815)
@@ -360,15 +360,6 @@
 caught
 OUTPUT
 
-$ENV{TEST_PROG_ARGS} ||= '';
-my @todo = $ENV{TEST_PROG_ARGS} =~ /--run-pbc/
-    ? ( todo => '.tailcall and lexical maps not thawed from PBC, TT #1172' )
-    : ();
-#
-# this test is hanging in testr since pcc_hackathon_6Mar10 branch merge at r45108
-# converting to skip at the moment
-#
-
 pir_output_is( <<'CODE', <<'OUTPUT', "exit_handler via exit exception" );
 .sub main :main
     .local pmc a