Move all of Test::Harness's test modules into ext/Test/Harness/t/lib

p4raw-id: //depot/perl@34229

26 files changed, 25 insertions, 27 deletions

diff --git a/MANIFEST b/MANIFEST
index 8b59e6921c..280177c88a 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -1182,6 +1182,20 @@ ext/Test/Harness/t/errors.t				Test::Harness test
 ext/Test/Harness/t/grammar.t				Test::Harness test
 ext/Test/Harness/t/harness.t				Test::Harness test
 ext/Test/Harness/t/iterators.t				Test::Harness test
+ext/Test/Harness/t/lib/App/Prove/Plugin/Dummy.pm	Module for testing Test::Harness
+ext/Test/Harness/t/lib/Dev/Null.pm			Module for testing Test::Harness
+ext/Test/Harness/t/lib/EmptyParser.pm			Module for testing Test::Harness
+ext/Test/Harness/t/lib/IO/c55Capture.pm			Module for testing Test::Harness
+ext/Test/Harness/t/lib/MyCustom.pm			Module for testing Test::Harness
+ext/Test/Harness/t/lib/MyGrammar.pm			Module for testing Test::Harness
+ext/Test/Harness/t/lib/MyIteratorFactory.pm		Module for testing Test::Harness
+ext/Test/Harness/t/lib/MyIterator.pm			Module for testing Test::Harness
+ext/Test/Harness/t/lib/MyPerlSource.pm			Module for testing Test::Harness
+ext/Test/Harness/t/lib/MyResultFactory.pm		Module for testing Test::Harness
+ext/Test/Harness/t/lib/MyResult.pm			Module for testing Test::Harness
+ext/Test/Harness/t/lib/MySource.pm			Module for testing Test::Harness
+ext/Test/Harness/t/lib/NoFork.pm			Module for testing Test::Harness
+ext/Test/Harness/t/lib/TAP/Parser/SubclassTest.pm	Module for testing Test::Harness
 ext/Test/Harness/t/multiplexer.t			Test::Harness test
 ext/Test/Harness/t/nofork-mux.t				Test::Harness test
 ext/Test/Harness/t/nofork.t				Test::Harness test
@@ -3643,7 +3657,6 @@ t/io/through.t			See if pipe passes data intact
 t/io/utf8.t			See if file seeking works
 t/japh/abigail.t		Obscure tests
 t/lib/1_compile.t		See if the various libraries and extensions compile
-t/lib/App/Prove/Plugin/Dummy.pm	Module for testing Test::Harness
 t/lib/Cname.pm			Test charnames in regexes (op/pat.t)
 t/lib/common.pl			Helper for lib/{warnings,feature}.t
 t/lib/commonsense.t		See if configuration meets basic needs
@@ -3665,7 +3678,6 @@ t/lib/compress/zlib-generic.pl	Compress::Zlib
 t/lib/contains_pod.xr		Pod-Parser test file
 t/lib/cygwin.t			Builtin cygwin function tests
 t/lib/Devel/switchd.pm		Module for t/run/switchd.t
-t/lib/Dev/Null.pm		Module for testing Test::Harness
 t/lib/dprof/test1_t		Perl code profiler tests
 t/lib/dprof/test1_v		Perl code profiler tests
 t/lib/dprof/test2_t		Perl code profiler tests
@@ -3683,7 +3695,6 @@ t/lib/dprof/test7_v		Perl code profiler tests
 t/lib/dprof/test8_t		Perl code profiler tests
 t/lib/dprof/test8_v		Perl code profiler tests
 t/lib/dprof/V.pm		Perl code profiler tests
-t/lib/EmptyParser.pm		Module for testing Test::Harness
 t/lib/feature/bundle		Tests for feature bundles
 t/lib/feature/implicit		Tests for implicit loading of feature.pm
 t/lib/feature/nonesuch		Tests for enabling/disabling nonexistent feature
@@ -3697,7 +3708,6 @@ t/lib/filter-util.pl		See if Filter::Util::Call works
 t/lib/h2ph.h			Test header file for h2ph
 t/lib/h2ph.pht			Generated output from h2ph.h by h2ph, for comparison
 t/lib/HasSigDie.pm		Module for testing base.pm
-t/lib/IO/c55Capture.pm		Module for testing Test::Harness
 t/lib/locale/latin1		Part of locale.t in Latin 1
 t/lib/locale/utf8		Part of locale.t in UTF8
 t/lib/MakeMaker/Test/Setup/BFD.pm	MakeMaker test utilities
@@ -3711,24 +3721,14 @@ t/lib/Math/BigInt/BareCalc.pm	Bigint's simulation of Calc
 t/lib/Math/BigInt/Scalar.pm	Pure Perl module to support Math::BigInt
 t/lib/Math/BigInt/Subclass.pm	Empty subclass of BigInt for test
 t/lib/Math/BigRat/Test.pm		Math::BigRat test helper
-t/lib/MyCustom.pm		Module for testing Test::Harness
-t/lib/MyGrammar.pm		Module for testing Test::Harness
-t/lib/MyIteratorFactory.pm	Module for testing Test::Harness
-t/lib/MyIterator.pm		Module for testing Test::Harness
-t/lib/MyPerlSource.pm		Module for testing Test::Harness
 t/lib/mypragma.pm		An example user pragma
 t/lib/mypragma.t		Test the example user pragma
-t/lib/MyResultFactory.pm	Module for testing Test::Harness
-t/lib/MyResult.pm		Module for testing Test::Harness
-t/lib/MySource.pm		Module for testing Test::Harness
-t/lib/NoFork.pm			Module for testing Test::Harness
 t/lib/no_load.t			Test that some modules don't load others
 t/lib/proxy_constant_subs.t	Test that Proxy Constant Subs behave correctly
 t/lib/Sans_mypragma.pm			Test module for t/lib/mypragma.t
 t/lib/strict/refs		Tests of "use strict 'refs'" for strict.t
 t/lib/strict/subs		Tests of "use strict 'subs'" for strict.t
 t/lib/strict/vars		Tests of "use strict 'vars'" for strict.t
-t/lib/TAP/Parser/SubclassTest.pm	Module for testing Test::Harness
 t/lib/Test/Simple/Catch.pm	Utility module for testing Test::Simple
 t/lib/Test/Simple/sample_tests/death_in_eval.plx	for exit.t
 t/lib/Test/Simple/sample_tests/death.plx		for exit.t
diff --git a/Porting/Maintainers.pl b/Porting/Maintainers.pl
index 5a7fbe008c..144b3530cf 100644
--- a/Porting/Maintainers.pl
+++ b/Porting/Maintainers.pl
@@ -871,9 +871,7 @@ package Maintainers;
 	'Test::Harness' =>
 		{
 		'MAINTAINER'	=> 'andya',
-		'FILES'		=> q[ext/Test/Harness t/lib/Dev/Null.pm
-				     t/lib/App/Prove/Plugin/Dummy.pm
-				     t/lib/IO/c55Capture.pm t/lib/NoFork.pm],
+		'FILES'		=> q[ext/Test/Harness],
 		'CPAN'		=> 1,
 		},
 
diff --git a/ext/Test/Harness/t/compat/inc_taint.t b/ext/Test/Harness/t/compat/inc_taint.t
index bdb0d73e19..234dca0ee9 100644
--- a/ext/Test/Harness/t/compat/inc_taint.t
+++ b/ext/Test/Harness/t/compat/inc_taint.t
@@ -3,7 +3,7 @@
 BEGIN {
     if ( $ENV{PERL_CORE} ) {
         chdir 't';
-        @INC = ( '../lib', 'lib' );
+        @INC = ( '../lib', '../ext/Test/Harness/t/lib' );
     }
     else {
         use lib 't/lib';
diff --git a/ext/Test/Harness/t/grammar.t b/ext/Test/Harness/t/grammar.t
index f1521ede5e..d880f1b41d 100644
--- a/ext/Test/Harness/t/grammar.t
+++ b/ext/Test/Harness/t/grammar.t
@@ -5,7 +5,7 @@ use strict;
 BEGIN {
     if ( $ENV{PERL_CORE} ) {
         chdir 't';
-        @INC = ( '../lib', 'lib' );
+        @INC = ( '../lib', '../ext/Test/Harness/t/lib' );
     }
     else {
         unshift @INC, 't/lib';
diff --git a/ext/Test/Harness/t/harness.t b/ext/Test/Harness/t/harness.t
index 716ea59f02..32b91627b8 100644
--- a/ext/Test/Harness/t/harness.t
+++ b/ext/Test/Harness/t/harness.t
@@ -3,7 +3,7 @@
 BEGIN {
     if ( $ENV{PERL_CORE} ) {
         chdir 't';
-        @INC = ( '../lib', 'lib' );
+        @INC = ( '../lib', '../ext/Test/Harness/t/lib' );
     }
     else {
         unshift @INC, 't/lib';
diff --git a/t/lib/App/Prove/Plugin/Dummy.pm b/ext/Test/Harness/t/lib/App/Prove/Plugin/Dummy.pm
index 7e285bdc7f..7e285bdc7f 100644
--- a/t/lib/App/Prove/Plugin/Dummy.pm
+++ b/ext/Test/Harness/t/lib/App/Prove/Plugin/Dummy.pm
diff --git a/t/lib/Dev/Null.pm b/ext/Test/Harness/t/lib/Dev/Null.pm
index 09ca5d6627..09ca5d6627 100644
--- a/t/lib/Dev/Null.pm
+++ b/ext/Test/Harness/t/lib/Dev/Null.pm
diff --git a/t/lib/EmptyParser.pm b/ext/Test/Harness/t/lib/EmptyParser.pm
index 2f7ec2428e..2f7ec2428e 100644
--- a/t/lib/EmptyParser.pm
+++ b/ext/Test/Harness/t/lib/EmptyParser.pm
diff --git a/t/lib/IO/c55Capture.pm b/ext/Test/Harness/t/lib/IO/c55Capture.pm
index ecbcb49ba7..ecbcb49ba7 100644
--- a/t/lib/IO/c55Capture.pm
+++ b/ext/Test/Harness/t/lib/IO/c55Capture.pm
diff --git a/t/lib/MyCustom.pm b/ext/Test/Harness/t/lib/MyCustom.pm
index 2402312edc..2402312edc 100644
--- a/t/lib/MyCustom.pm
+++ b/ext/Test/Harness/t/lib/MyCustom.pm
diff --git a/t/lib/MyGrammar.pm b/ext/Test/Harness/t/lib/MyGrammar.pm
index ef93f9dfc1..ef93f9dfc1 100644
--- a/t/lib/MyGrammar.pm
+++ b/ext/Test/Harness/t/lib/MyGrammar.pm
diff --git a/t/lib/MyIterator.pm b/ext/Test/Harness/t/lib/MyIterator.pm
index 561f6e2c78..561f6e2c78 100644
--- a/t/lib/MyIterator.pm
+++ b/ext/Test/Harness/t/lib/MyIterator.pm
diff --git a/t/lib/MyIteratorFactory.pm b/ext/Test/Harness/t/lib/MyIteratorFactory.pm
index d8c3269cda..d8c3269cda 100644
--- a/t/lib/MyIteratorFactory.pm
+++ b/ext/Test/Harness/t/lib/MyIteratorFactory.pm
diff --git a/t/lib/MyPerlSource.pm b/ext/Test/Harness/t/lib/MyPerlSource.pm
index 6193db97df..6193db97df 100644
--- a/t/lib/MyPerlSource.pm
+++ b/ext/Test/Harness/t/lib/MyPerlSource.pm
diff --git a/t/lib/MyResult.pm b/ext/Test/Harness/t/lib/MyResult.pm
index ab4845dedf..ab4845dedf 100644
--- a/t/lib/MyResult.pm
+++ b/ext/Test/Harness/t/lib/MyResult.pm
diff --git a/t/lib/MyResultFactory.pm b/ext/Test/Harness/t/lib/MyResultFactory.pm
index 371bba632b..371bba632b 100644
--- a/t/lib/MyResultFactory.pm
+++ b/ext/Test/Harness/t/lib/MyResultFactory.pm
diff --git a/t/lib/MySource.pm b/ext/Test/Harness/t/lib/MySource.pm
index 5e41b829ae..5e41b829ae 100644
--- a/t/lib/MySource.pm
+++ b/ext/Test/Harness/t/lib/MySource.pm
diff --git a/t/lib/NoFork.pm b/ext/Test/Harness/t/lib/NoFork.pm
index 0225e9628d..0225e9628d 100644
--- a/t/lib/NoFork.pm
+++ b/ext/Test/Harness/t/lib/NoFork.pm
diff --git a/t/lib/TAP/Parser/SubclassTest.pm b/ext/Test/Harness/t/lib/TAP/Parser/SubclassTest.pm
index 84becee932..84becee932 100644
--- a/t/lib/TAP/Parser/SubclassTest.pm
+++ b/ext/Test/Harness/t/lib/TAP/Parser/SubclassTest.pm
diff --git a/ext/Test/Harness/t/nofork-mux.t b/ext/Test/Harness/t/nofork-mux.t
index 5751945076..d2df8d0f1e 100644
--- a/ext/Test/Harness/t/nofork-mux.t
+++ b/ext/Test/Harness/t/nofork-mux.t
@@ -3,7 +3,7 @@
 BEGIN {
     if ( $ENV{PERL_CORE} ) {
         chdir 't';
-        @INC = ( '../lib', 'lib' );
+        @INC = ( '../lib', '../ext/Test/Harness/t/lib' );
     }
     else {
         use lib 't/lib';
diff --git a/ext/Test/Harness/t/nofork.t b/ext/Test/Harness/t/nofork.t
index 7f2782059d..72a2adb33c 100755
--- a/ext/Test/Harness/t/nofork.t
+++ b/ext/Test/Harness/t/nofork.t
@@ -6,7 +6,7 @@
 BEGIN {
     if ( $ENV{PERL_CORE} ) {
         chdir 't';
-        @INC = ( '../lib', 'lib' );
+        @INC = ( '../lib', '../ext/Test/Harness/t/lib' );
     }
     else {
         use lib 't/lib';
diff --git a/ext/Test/Harness/t/parse.t b/ext/Test/Harness/t/parse.t
index 39f2c380c9..b52f2c5fe7 100755
--- a/ext/Test/Harness/t/parse.t
+++ b/ext/Test/Harness/t/parse.t
@@ -5,7 +5,7 @@ use strict;
 BEGIN {
     if ( $ENV{PERL_CORE} ) {
         chdir 't';
-        @INC = ( '../lib', 'lib' );
+        @INC = ( '../lib', '../ext/Test/Harness/t/lib' );
     }
     else {
         use lib 't/lib';
diff --git a/ext/Test/Harness/t/parser-config.t b/ext/Test/Harness/t/parser-config.t
index 0c74427fa6..5f8b03feac 100644
--- a/ext/Test/Harness/t/parser-config.t
+++ b/ext/Test/Harness/t/parser-config.t
@@ -3,7 +3,7 @@
 BEGIN {
     if ( $ENV{PERL_CORE} ) {
         chdir 't';
-        @INC = ( '../lib', 'lib' );
+        @INC = ( '../lib', '../ext/Test/Harness/t/lib' );
     }
     else {
         unshift @INC, 't/lib';
diff --git a/ext/Test/Harness/t/parser-subclass.t b/ext/Test/Harness/t/parser-subclass.t
index 2817751714..f86c058c28 100644
--- a/ext/Test/Harness/t/parser-subclass.t
+++ b/ext/Test/Harness/t/parser-subclass.t
@@ -3,7 +3,7 @@
 BEGIN {
     if ( $ENV{PERL_CORE} ) {
         chdir 't';
-        @INC = ( '../lib', 'lib' );
+        @INC = ( '../lib', '../ext/Test/Harness/t/lib' );
     }
     else {
         unshift @INC, 't/lib';
diff --git a/ext/Test/Harness/t/prove.t b/ext/Test/Harness/t/prove.t
index 38b9b85097..5dbbe0ed5a 100644
--- a/ext/Test/Harness/t/prove.t
+++ b/ext/Test/Harness/t/prove.t
@@ -3,7 +3,7 @@
 BEGIN {
     if ( $ENV{PERL_CORE} ) {
         chdir 't';
-        @INC = ( '../lib', 'lib' );
+        @INC = ( '../lib', '../ext/Test/Harness/t/lib' );
     }
     else {
         unshift @INC, 't/lib';
diff --git a/ext/Test/Harness/t/source.t b/ext/Test/Harness/t/source.t
index a6441a5242..99d81f9b16 100644
--- a/ext/Test/Harness/t/source.t
+++ b/ext/Test/Harness/t/source.t
@@ -3,7 +3,7 @@
 BEGIN {
     if ( $ENV{PERL_CORE} ) {
         chdir 't';
-        @INC = ( '../lib', 'lib' );
+        @INC = ( '../lib', '../ext/Test/Harness/t/lib' );
     }
     else {
         unshift @INC, 't/lib';