Disable ornaments on perl5db AutoTrace tests

perl-5.18.0-Disable-ornaments-on-perl5db-AutoTrace-tests.patch

@@ -0,0 +1,57 @@
+From 27728658b28c256f96dd6e7b5a2de70373d62ff1 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
+Date: Tue, 9 Jul 2013 12:25:00 +0200
+Subject: [PATCH] Disable ornaments on perl5db AutoTrace tests
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+If TERM=vt100, Term::ReadLine will put ornaments that break the
+AutoTrace test:
+
+ Failed test 100 - Test the o AutoTrace command at ../lib/perl5db.t line 2302
+      got 'main::(../lib/perl5db/t/disable-breakpoints-1:2):
+ 2:	my $x = "One";
+ main::(../lib/perl5db/t/disable-breakpoints-1:3):
+ 3:	my $dummy = 0;
+ main::(../lib/perl5db/t/disable-breakpoints-1:5):
+ 5:	$x = "FirstVal";
+ main::(..Debugged program terminated.  Use <31><6D>q<30><6D> to quit or <31><6D>R<30><6D> to restart,
+ use <31><6D>o<30><6D> <34><6D>inhibit_exit<><6D> to avoid stopping after program termination,
+ <31><6D>h q<30><6D>, <31><6D>h R<30><6D> or <31><6D>h o<30><6D> to get additional info.
+ auto(-1)  DB<2> q
+ ::(../lib/perl5db/t/disable-breakpoints-1:15):
+ 15:	$dummy++;
+ main::(../lib/perl5db/t/disable-breakpoints-1:17):
+ 17:	$x = "FourthVal";
+ main::(../lib/perl5db/t/disable-breakpoints-1:19):
+ 19:	$dummy++;
+ '
+ expected /(?^msx:
+         ^main::\([^:]+:15\):\n
+         15:\s+\$dummy\+\+;\n
+         main::\([^:]+:17\):\n
+         17:\s+\$x\ =\ "FourthVal";\n
+         )/
+
+Signed-off-by: Petr Písař <ppisar@redhat.com>
+---
+ lib/perl5db.t | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/perl5db.t b/lib/perl5db.t
+index 9a57960..186f695 100644
+--- a/lib/perl5db.t
++++ b/lib/perl5db.t
+@@ -2334,7 +2334,7 @@ sub _calc_trace_wrapper
+         {
+             cmds =>
+             [
+-                'o AutoTrace',
++                'o AutoTrace ornaments=0',
+                 'c',
+                 'q',
+             ],
+-- 
+1.8.1.4
+

perl-5.18.0-Fix-perl5db-test.patch

@@ -1,12 +0,0 @@
-diff -up perl-5.18.0-orig/lib/perl5db.pl.orig perl-5.18.0-orig/lib/perl5db.pl
-diff -up perl-5.18.0-orig/lib/perl5db.t.orig perl-5.18.0-orig/lib/perl5db.t
---- perl-5.18.0-orig/lib/perl5db.t.orig	2013-06-11 16:56:29.291375625 +0200
-+++ perl-5.18.0-orig/lib/perl5db.t	2013-06-12 13:51:32.268233583 +0200
-@@ -2286,6 +2286,7 @@ sub _calc_trace_wrapper
- 
- # Test the o AutoTrace command
- {
-+    local $ENV{PERL_RL} = "o=0";
-     my $wrapper = DebugWrap->new(
-         {
-             cmds =>

perl.spec

@@ -86,8 +86,8 @@ Patch10:        perl-5.19.0-Synchronize-h2ph-POD-text-with-usage-output.patch
 # Update pod2html(1) documentation, rhbz#948538, RT#117623
 Patch11:        perl-5.16.3-Synchronize-pod2html-usage-output-and-its-POD-text.patch
 
-# Fix a test failure in perl5db.t when Term::ReadLine::Gnu is installed
+# Fix a test failure in perl5db.t when TERM=vt100, RT#118817
-Patch12:        perl-5.18.0-Fix-perl5db-test.patch
+Patch12:        perl-5.18.0-Disable-ornaments-on-perl5db-AutoTrace-tests.patch
 
 # Fix regmatch pointer 32-bit wraparound regression, RT#118175
 Patch13:        perl-5.18.0-Fix-regmatch-pointer-32-bit-wraparound-regression.patch
@@ -1891,6 +1891,7 @@ perl -x patchlevel.h \
     'Fedora Patch9: Fix find2perl to translate ? glob properly (RT#113054)' \
     'Fedora Patch10: Update h2ph(1) documentation (RT#117647)' \
     'Fedora Patch11: Update pod2html(1) documentation (RT#117623)' \
+    'Fedora Patch12: Disable ornaments on perl5db AutoTrace tests (RT#118817)' \
     'Fedora Patch13: Fix regmatch pointer 32-bit wraparound regression (RT#118175)' \
     'Fedora Patch14: Do not use system Term::ReadLine::Gnu in tests (RT#118821)' \
     %{nil}
@@ -3564,6 +3565,7 @@ sed \
 %changelog
 * Mon Jul 08 2013 Petr Pisar <ppisar@redhat.com> - 4:5.18.0-282
 - Do not load system Term::ReadLine::Gnu while running tests
+- Disable ornaments on perl5db AutoTrace tests
 
 * Thu Jul 04 2013 Jitka Plesnikova <jplesnik@redhat.com> - 4:5.18.0-281
 - Update to Perl 5.18.0