From 5fddd31d7b2dc088b4b71080d71434186b7722e0 Mon Sep 17 00:00:00 2001
From: Steve Hay <steve.m.hay@googlemail.com>
Date: Wed, 10 Aug 2016 13:54:26 +0100
Subject: Exclude a new Pod-Perldoc test script for now, since it's failing in
 core

Failures on Win32/MSVC++ when dropped into core are:

not ok 3 - got expected output in STDOUT
#   Failed test 'got expected output in STDOUT'
#   at t/02_module_pod_output.t line 40.
#                   undef
#     doesn't match '(?^:Look up Perl documentation)'

not ok 7 - got expected output in STDERR
#   Failed test 'got expected output in STDERR'
#   at t/02_module_pod_output.t line 73.
#                   ''perl' is not recognized as an internal or external command
,
# operable program or batch file.
# '
#     doesn't match '(?^:No documentation)'
---
 MANIFEST                                  |  1 -
 Porting/Maintainers.pl                    | 15 ++++---
 cpan/Pod-Perldoc/t/02_module_pod_output.t | 74 -------------------------------
 3 files changed, 10 insertions(+), 80 deletions(-)
 delete mode 100644 cpan/Pod-Perldoc/t/02_module_pod_output.t

diff --git a/MANIFEST b/MANIFEST
index 1ea715f982..f170c9365d 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -1978,7 +1978,6 @@ cpan/Pod-Perldoc/Makefile.PL
 cpan/Pod-Perldoc/perldoc.pod
 cpan/Pod-Perldoc/t/00_load.t			test file for Pod-Perldoc
 cpan/Pod-Perldoc/t/01_about_verbose.t		test file for Pod-Perldoc
-cpan/Pod-Perldoc/t/02_module_pod_output.t	test file for Pod-Perldoc
 cpan/Pod-Perldoc/t/man/_get_columns.t		test file for Pod-Perldoc
 cpan/Pod-Perldoc/t/pod.t			test file for Pod-Perldoc
 cpan/Pod-Simple/lib/Pod/Simple.pm			Pod made simple
diff --git a/Porting/Maintainers.pl b/Porting/Maintainers.pl
index 70f95d0a37..d9f931ffb7 100755
--- a/Porting/Maintainers.pl
+++ b/Porting/Maintainers.pl
@@ -981,11 +981,16 @@ use File::Glob qw(:case);
         # Note that we use the CPAN-provided Makefile.PL, since it
         # contains special handling of the installation of perldoc.pod
 
-        # In blead, the perldoc executable is generated by perldoc.PL
-        # instead
-        # XXX We can and should fix this, but clean up the DRY-failure in utils
-        # first
-        'EXCLUDED' => ['perldoc'],
+        'EXCLUDED' => [
+            # In blead, the perldoc executable is generated by perldoc.PL
+            # instead
+            # XXX We can and should fix this, but clean up the DRY-failure in
+            # utils first
+            'perldoc',
+
+            # https://rt.cpan.org/Ticket/Display.html?id=116827
+            't/02_module_pod_output.t'
+        ],
     },
 
     'Pod::Simple' => {
diff --git a/cpan/Pod-Perldoc/t/02_module_pod_output.t b/cpan/Pod-Perldoc/t/02_module_pod_output.t
deleted file mode 100644
index abfaa2a548..0000000000
--- a/cpan/Pod-Perldoc/t/02_module_pod_output.t
+++ /dev/null
@@ -1,74 +0,0 @@
-
-use File::Spec;
-use FindBin qw($Bin);
-
-use IPC::Open3;
-use Test::More;
-
-
-my $pid = undef;
-my $stdout = undef;
-my $stderr = undef;
-
-# get path to perldoc exec in a hopefully platform neutral way..
-my ($volume, $bindir, undef) = File::Spec->splitpath($Bin);
-my $perldoc = File::Spec->catpath($volume,$bindir, File::Spec->catfile(qw(blib script perldoc)));
-my @dir = ($bindir,"lib","Pod");
-my $podpath = File::Spec->catdir(@dir);
-my $good_podfile = File::Spec->catpath($volume,$podpath,"Perldoc.pm");
-my $bad_podfile = File::Spec->catpath($volume,$podpath,"asdfsdaf.pm");
-
-plan tests => 7;
-
-# First, look for something that should be there
-
-eval{
-
-$pid = open3(\*CHLD_IN,\*CHLD_OUT1,\*CHLD_ERR1,"perl " .$perldoc." ".$good_podfile);
-
-};
-
-is(length($@),0,"open succeeded"); # returns '' not undef
-ok(defined($pid),"got process id");
-
-#gather STDOUT
-while(<CHLD_OUT1>){
- $stdout .=$_;
-}
-
-#check STDOUT
-like($stdout,qr/Look up Perl documentation/,"got expected output in STDOUT");
-
-while(<CHLD_ERR1>){
- $stderr .=$_;
-}
-
-#is($stderr,undef,"no output to STDERR as expected");
-
-# Then look for something that should not be there
-$stdout = undef;
-$stderr = undef;
-
-eval{
-
-$pid = open3(\*CHLD_IN,\*CHLD_OUT2,\*CHLD_ERR2,"perl " .$perldoc." ".$bad_podfile);
-
-};
-
-is(length($@),0,"open succeeded"); # returns '' not undef
-ok(defined($pid),"got process id");
-
-#gather STDOUT
-while(<CHLD_OUT2>){
- $stdout .=$_;
-}
-
-#check STDOUT
-is($stdout,undef,"no output to STDOUT as expected");
-
-while(<CHLD_ERR2>){
- $stderr .=$_;
-}
-
-like($stderr,qr/No documentation/,"got expected output in STDERR");
-
-- 
cgit v1.2.1