Author: rurban
Date: Tue Feb 17 17:32:24 2009
New Revision: 36820
URL: https://trac.parrot.org/parrot/changeset/36820
Log:
TT #281: fix make testf for t/op/debuginfo.t 1,7-8
- skip tests on -f runcore
- nullify current_pc on fast_core on init
Modified:
trunk/src/runops_cores.c
trunk/t/op/debuginfo.t
Modified: trunk/src/runops_cores.c
==============================================================================
--- trunk/src/runops_cores.c Tue Feb 17 17:28:58 2009 (r36819)
+++ trunk/src/runops_cores.c Tue Feb 17 17:32:24 2009 (r36820)
@@ -279,6 +279,10 @@
runops_fast_core(PARROT_INTERP, ARGIN(opcode_t *pc))
{
ASSERT_ARGS(runops_fast_core)
+
+ /* disable pc */
+ CONTEXT(interp)->current_pc = NULL;
+
while (pc) {
DO_OP(pc, interp);
}
@@ -307,6 +311,10 @@
runops_cgoto_core(PARROT_INTERP, ARGIN(opcode_t *pc))
{
ASSERT_ARGS(runops_cgoto_core)
+
+ /* disable pc */
+ CONTEXT(interp)->current_pc = NULL;
+
#ifdef HAVE_COMPUTED_GOTO
pc = cg_core(pc, interp);
return pc;
Modified: trunk/t/op/debuginfo.t
==============================================================================
--- trunk/t/op/debuginfo.t Tue Feb 17 17:28:58 2009 (r36819)
+++ trunk/t/op/debuginfo.t Tue Feb 17 17:32:24 2009 (r36820)
@@ -23,19 +23,24 @@
=cut
-pasm_output_like( <<'CODE', <<'OUTPUT', "getline, getfile" );
+$ENV{TEST_PROG_ARGS} ||= '';
+my $nolineno = $ENV{TEST_PROG_ARGS} =~ /-f|-g/
+ ? "\\(unknown file\\)\n-1" : "debuginfo_\\d+\\.pasm\n\\d";
+
+SKIP: {
+skip "disabled on fast-core",1 if $ENV{TEST_PROG_ARGS} =~ /-f/;
+
+pasm_output_like( <<'CODE', <<"OUTPUT", "getline, getfile" );
.pcc_sub main:
getfile S0
getline I0
- print S0
- print "\n"
- print I0
- print "\n"
+ say S0
+ say I0
end
CODE
-/debuginfo_\d+\.pasm
-\d/
+/$nolineno/
OUTPUT
+}
pir_error_output_like( <<'CODE', <<'OUTPUT', "debug backtrace - Null PMC access" );
.sub main
@@ -159,8 +164,14 @@
called from Sub 'main' pc (\d+|-1) \(.*?:(\d+|-1)\)$/
OUTPUT
+$nolineno = $ENV{TEST_PROG_ARGS} =~ /-f|-g/
+ ? '\(\(unknown file\):-1\)' : '\(xyz.pir:126\)';
+
+SKIP: {
+skip "disabled on fast-core",2 if $ENV{TEST_PROG_ARGS} =~ /-f/;
+
# See "RT #43269 and .annotate
-pir_error_output_like( <<'CODE', <<'OUTPUT', "setfile and setline" );
+pir_error_output_like( <<'CODE', <<"OUTPUT", "setfile and setline" );
.sub main :main
setfile "xyz.pir"
setline 123
@@ -169,11 +180,13 @@
'no_such_function'($S0, $I0)
.end
CODE
-/\(xyz.pir:126\)/
+/$nolineno/
OUTPUT
+$nolineno = $ENV{TEST_PROG_ARGS} =~ /-f|-g/
+ ? '\(\(unknown file\):-1\)' : '\(foo.p6:128\)';
# See "RT #43269 and .annotate
-pir_error_output_like( <<'CODE', <<'OUTPUT', "setfile and setline" );
+pir_error_output_like( <<'CODE', <<"OUTPUT", "setfile and setline" );
.sub main :main
setfile "foo.p6"
setline 123
@@ -188,9 +201,11 @@
'nsf'($P1)
.end
CODE
-/\(foo.p6:128\)/
+/$nolineno/
OUTPUT
+}
+
# Local Variables:
# mode: cperl
# cperl-indent-level: 4