Move the modules, tests, prove and Changes file from lib/ to

ext/Test/Harness. Not everything is there yet, but it makes it way
easier to swap the directory out and replace it with a trunk svn
checkout.

p4raw-id: //depot/perl@34206

87 files changed, 137 insertions, 87 deletions

diff --git a/MANIFEST b/MANIFEST
index 6435153975..12a6474c29 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -1121,6 +1121,91 @@ ext/Sys/Syslog/win32/PerlLog_dll.uu	Sys::Syslog extension Win32 related file
 ext/Sys/Syslog/win32/PerlLog.mc	Sys::Syslog extension Win32 related file
 ext/Sys/Syslog/win32/PerlLog_RES.uu	Sys::Syslog extension Win32 related file
 ext/Sys/Syslog/win32/Win32.pm	Sys::Syslog extension Win32 related file
+ext/Test/Harness/bin/prove		The prove harness utility
+ext/Test/Harness/Changes		Test::Harness change log
+ext/Test/Harness/lib/App/Prove.pm	Gubbins for the prove utility
+ext/Test/Harness/lib/App/Prove/State.pm	Gubbins for the prove utility
+ext/Test/Harness/lib/TAP/Base.pm			A parser for Test Anything Protocol
+ext/Test/Harness/lib/TAP/Formatter/Color.pm		A parser for Test Anything Protocol
+ext/Test/Harness/lib/TAP/Formatter/Console/ParallelSession.pm	A parser for Test Anything Protocol
+ext/Test/Harness/lib/TAP/Formatter/Console.pm		A parser for Test Anything Protocol
+ext/Test/Harness/lib/TAP/Formatter/Console/Session.pm	A parser for Test Anything Protocol
+ext/Test/Harness/lib/TAP/Harness.pm			A parser for Test Anything Protocol
+ext/Test/Harness/lib/TAP/Object.pm			A parser for Test Anything Protocol
+ext/Test/Harness/lib/TAP/Parser/Aggregator.pm		A parser for Test Anything Protocol
+ext/Test/Harness/lib/TAP/Parser/Grammar.pm		A parser for Test Anything Protocol
+ext/Test/Harness/lib/TAP/Parser/Iterator/Array.pm	A parser for Test Anything Protocol
+ext/Test/Harness/lib/TAP/Parser/IteratorFactory.pm	A parser for Test Anything Protocol
+ext/Test/Harness/lib/TAP/Parser/Iterator.pm		A parser for Test Anything Protocol
+ext/Test/Harness/lib/TAP/Parser/Iterator/Process.pm	A parser for Test Anything Protocol
+ext/Test/Harness/lib/TAP/Parser/Iterator/Stream.pm	A parser for Test Anything Protocol
+ext/Test/Harness/lib/TAP/Parser/Multiplexer.pm		A parser for Test Anything Protocol
+ext/Test/Harness/lib/TAP/Parser.pm			A parser for Test Anything Protocol
+ext/Test/Harness/lib/TAP/Parser/Result/Bailout.pm	A parser for Test Anything Protocol
+ext/Test/Harness/lib/TAP/Parser/Result/Comment.pm	A parser for Test Anything Protocol
+ext/Test/Harness/lib/TAP/Parser/ResultFactory.pm	A parser for Test Anything Protocol
+ext/Test/Harness/lib/TAP/Parser/Result/Plan.pm		A parser for Test Anything Protocol
+ext/Test/Harness/lib/TAP/Parser/Result.pm		A parser for Test Anything Protocol
+ext/Test/Harness/lib/TAP/Parser/Result/Pragma.pm	A parser for Test Anything Protocol
+ext/Test/Harness/lib/TAP/Parser/Result/Test.pm		A parser for Test Anything Protocol
+ext/Test/Harness/lib/TAP/Parser/Result/Unknown.pm	A parser for Test Anything Protocol
+ext/Test/Harness/lib/TAP/Parser/Result/Version.pm	A parser for Test Anything Protocol
+ext/Test/Harness/lib/TAP/Parser/Result/YAML.pm		A parser for Test Anything Protocol
+ext/Test/Harness/lib/TAP/Parser/Scheduler/Job.pm	A parser for Test Anything Protocol
+ext/Test/Harness/lib/TAP/Parser/Scheduler.pm		A parser for Test Anything Protocol
+ext/Test/Harness/lib/TAP/Parser/Scheduler/Spinner.pm	A parser for Test Anything Protocol
+ext/Test/Harness/lib/TAP/Parser/Source/Perl.pm		A parser for Test Anything Protocol
+ext/Test/Harness/lib/TAP/Parser/Source.pm		A parser for Test Anything Protocol
+ext/Test/Harness/lib/TAP/Parser/Utils.pm		A parser for Test Anything Protocol
+ext/Test/Harness/lib/TAP/Parser/YAMLish/Reader.pm	A parser for Test Anything Protocol
+ext/Test/Harness/lib/TAP/Parser/YAMLish/Writer.pm	A parser for Test Anything Protocol
+ext/Test/Harness/lib/Test/Harness.pm			A test harness
+ext/Test/Harness/Makefile.PL				Makefile.PL for Test::Harness
+ext/Test/Harness/t/000-load.t				Test::Harness test
+ext/Test/Harness/t/aggregator.t				Test::Harness test
+ext/Test/Harness/t/bailout.t				Test::Harness test
+ext/Test/Harness/t/base.t				Test::Harness test
+ext/Test/Harness/t/callbacks.t				Test::Harness test
+ext/Test/Harness/t/compat/env.t				Test::Harness test
+ext/Test/Harness/t/compat/failure.t			Test::Harness test
+ext/Test/Harness/t/compat/inc-propagation.t		Test::Harness test
+ext/Test/Harness/t/compat/inc_taint.t			Test::Harness test
+ext/Test/Harness/t/compat/nonumbers.t			Test::Harness test
+ext/Test/Harness/t/compat/regression.t			Test::Harness test
+ext/Test/Harness/t/compat/test-harness-compat.t		Test::Harness test
+ext/Test/Harness/t/compat/version.t			Test::Harness test
+ext/Test/Harness/t/console.t				Test::Harness test
+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/multiplexer.t			Test::Harness test
+ext/Test/Harness/t/nofork-mux.t				Test::Harness test
+ext/Test/Harness/t/nofork.t				Test::Harness test
+ext/Test/Harness/t/object.t				Test::Harness test
+ext/Test/Harness/t/parser-config.t			Test::Harness test
+ext/Test/Harness/t/parser-subclass.t			Test::Harness test
+ext/Test/Harness/t/parse.t				Test::Harness test
+ext/Test/Harness/t/premature-bailout.t			Test::Harness test
+ext/Test/Harness/t/process.t				Test::Harness test
+ext/Test/Harness/t/proveenv.t				Test::Harness test
+ext/Test/Harness/t/proverc.t				Test::Harness test
+ext/Test/Harness/t/proverun.t				Test::Harness test
+ext/Test/Harness/t/prove.t				Test::Harness test
+ext/Test/Harness/t/regression.t				Test::Harness test
+ext/Test/Harness/t/results.t				Test::Harness test
+ext/Test/Harness/t/scheduler.t				Test::Harness test
+ext/Test/Harness/t/source.t				Test::Harness test
+ext/Test/Harness/t/spool.t				Test::Harness test
+ext/Test/Harness/t/state.t				Test::Harness test
+ext/Test/Harness/t/streams.t				Test::Harness test
+ext/Test/Harness/t/taint.t				Test::Harness test
+ext/Test/Harness/t/testargs.t				Test::Harness test
+ext/Test/Harness/t/unicode.t				Test::Harness test
+ext/Test/Harness/t/utils.t				Test::Harness test
+ext/Test/Harness/t/yamlish-output.t			Test::Harness test
+ext/Test/Harness/t/yamlish.t				Test::Harness test
+ext/Test/Harness/t/yamlish-writer.t			Test::Harness test
 ext/Text/Soundex/Changes	Changelog for Text::Soundex
 ext/Text/Soundex/Makefile.PL	Text::Soundex extension makefile writer
 ext/Text/Soundex/README		README for Text::Soundex
@@ -1417,8 +1502,6 @@ keywords.pl			Program to write keywords.h
 lib/abbrev.pl			An abbreviation table builder
 lib/AnyDBM_File.pm		Perl module to emulate dbmopen
 lib/AnyDBM_File.t		See if AnyDBM_File works
-lib/App/Prove.pm		Gubbins for the prove utility
-lib/App/Prove/State.pm		Gubbins for the prove utility
 lib/Archive/Extract.pm	Archive::Extract
 lib/Archive/Extract/t/01_Archive-Extract.t	Archive::Extract tests
 lib/Archive/Extract/t/src/double_dir.zip.packed	Archive::Extract tests
@@ -2637,40 +2720,6 @@ lib/Symbol.pm			Symbol table manipulation routines
 lib/Symbol.t			See if Symbol works
 lib/syslog.pl			Perl library supporting syslogging
 lib/tainted.pl			Old code for tainting
-lib/TAP/Base.pm				A parser for Test Anything Protocol
-lib/TAP/Formatter/Color.pm		A parser for Test Anything Protocol
-lib/TAP/Formatter/Console/ParallelSession.pm	A parser for Test Anything Protocol
-lib/TAP/Formatter/Console.pm		A parser for Test Anything Protocol
-lib/TAP/Formatter/Console/Session.pm	A parser for Test Anything Protocol
-lib/TAP/Harness.pm			A parser for Test Anything Protocol
-lib/TAP/Object.pm			A parser for Test Anything Protocol
-lib/TAP/Parser/Aggregator.pm		A parser for Test Anything Protocol
-lib/TAP/Parser/Grammar.pm		A parser for Test Anything Protocol
-lib/TAP/Parser/Iterator/Array.pm	A parser for Test Anything Protocol
-lib/TAP/Parser/IteratorFactory.pm	A parser for Test Anything Protocol
-lib/TAP/Parser/Iterator.pm		A parser for Test Anything Protocol
-lib/TAP/Parser/Iterator/Process.pm	A parser for Test Anything Protocol
-lib/TAP/Parser/Iterator/Stream.pm	A parser for Test Anything Protocol
-lib/TAP/Parser/Multiplexer.pm		A parser for Test Anything Protocol
-lib/TAP/Parser.pm			A parser for Test Anything Protocol
-lib/TAP/Parser/Result/Bailout.pm	A parser for Test Anything Protocol
-lib/TAP/Parser/Result/Comment.pm	A parser for Test Anything Protocol
-lib/TAP/Parser/ResultFactory.pm		A parser for Test Anything Protocol
-lib/TAP/Parser/Result/Plan.pm		A parser for Test Anything Protocol
-lib/TAP/Parser/Result.pm		A parser for Test Anything Protocol
-lib/TAP/Parser/Result/Pragma.pm		A parser for Test Anything Protocol
-lib/TAP/Parser/Result/Test.pm		A parser for Test Anything Protocol
-lib/TAP/Parser/Result/Unknown.pm	A parser for Test Anything Protocol
-lib/TAP/Parser/Result/Version.pm	A parser for Test Anything Protocol
-lib/TAP/Parser/Result/YAML.pm		A parser for Test Anything Protocol
-lib/TAP/Parser/Scheduler/Job.pm		A parser for Test Anything Protocol
-lib/TAP/Parser/Scheduler.pm		A parser for Test Anything Protocol
-lib/TAP/Parser/Scheduler/Spinner.pm	A parser for Test Anything Protocol
-lib/TAP/Parser/Source/Perl.pm		A parser for Test Anything Protocol
-lib/TAP/Parser/Source.pm		A parser for Test Anything Protocol
-lib/TAP/Parser/Utils.pm			A parser for Test Anything Protocol
-lib/TAP/Parser/YAMLish/Reader.pm	A parser for Test Anything Protocol
-lib/TAP/Parser/YAMLish/Writer.pm	A parser for Test Anything Protocol
 lib/Term/ANSIColor/ChangeLog	Term::ANSIColor
 lib/Term/ANSIColor.pm		Perl module supporting termcap usage
 lib/Term/ANSIColor/README	Term::ANSIColor
@@ -2691,54 +2740,6 @@ lib/Test/Builder/Module.pm	Base class for test modules
 lib/Test/Builder.pm		For writing new test libraries
 lib/Test/Builder/Tester/Color.pm	Turn on color in Test::Builder::Tester
 lib/Test/Builder/Tester.pm	For testing Test::Builder based classes
-lib/Test/Harness/bin/prove	The prove harness utility
-lib/Test/Harness/Changes	Test::Harness change log
-lib/Test/Harness.pm		A test harness
-lib/Test/Harness/t/000-load.t		Test::Harness test
-lib/Test/Harness/t/aggregator.t		Test::Harness test
-lib/Test/Harness/t/bailout.t		Test::Harness test
-lib/Test/Harness/t/base.t		Test::Harness test
-lib/Test/Harness/t/callbacks.t		Test::Harness test
-lib/Test/Harness/t/compat/env.t		Test::Harness test
-lib/Test/Harness/t/compat/failure.t	Test::Harness test
-lib/Test/Harness/t/compat/inc-propagation.t		Test::Harness test
-lib/Test/Harness/t/compat/inc_taint.t	Test::Harness test
-lib/Test/Harness/t/compat/nonumbers.t	Test::Harness test
-lib/Test/Harness/t/compat/regression.t	Test::Harness test
-lib/Test/Harness/t/compat/test-harness-compat.t		Test::Harness test
-lib/Test/Harness/t/compat/version.t	Test::Harness test
-lib/Test/Harness/t/console.t		Test::Harness test
-lib/Test/Harness/t/errors.t		Test::Harness test
-lib/Test/Harness/t/grammar.t		Test::Harness test
-lib/Test/Harness/t/harness.t		Test::Harness test
-lib/Test/Harness/t/iterators.t		Test::Harness test
-lib/Test/Harness/t/multiplexer.t	Test::Harness test
-lib/Test/Harness/t/nofork-mux.t		Test::Harness test
-lib/Test/Harness/t/nofork.t		Test::Harness test
-lib/Test/Harness/t/object.t		Test::Harness test
-lib/Test/Harness/t/parser-config.t	Test::Harness test
-lib/Test/Harness/t/parser-subclass.t	Test::Harness test
-lib/Test/Harness/t/parse.t		Test::Harness test
-lib/Test/Harness/t/premature-bailout.t	Test::Harness test
-lib/Test/Harness/t/process.t		Test::Harness test
-lib/Test/Harness/t/proveenv.t		Test::Harness test
-lib/Test/Harness/t/proverc.t		Test::Harness test
-lib/Test/Harness/t/proverun.t		Test::Harness test
-lib/Test/Harness/t/prove.t		Test::Harness test
-lib/Test/Harness/t/regression.t		Test::Harness test
-lib/Test/Harness/t/results.t		Test::Harness test
-lib/Test/Harness/t/scheduler.t		Test::Harness test
-lib/Test/Harness/t/source.t		Test::Harness test
-lib/Test/Harness/t/spool.t		Test::Harness test
-lib/Test/Harness/t/state.t		Test::Harness test
-lib/Test/Harness/t/streams.t		Test::Harness test
-lib/Test/Harness/t/taint.t		Test::Harness test
-lib/Test/Harness/t/testargs.t		Test::Harness test
-lib/Test/Harness/t/unicode.t		Test::Harness test
-lib/Test/Harness/t/utils.t		Test::Harness test
-lib/Test/Harness/t/yamlish-output.t	Test::Harness test
-lib/Test/Harness/t/yamlish.t		Test::Harness test
-lib/Test/Harness/t/yamlish-writer.t	Test::Harness test
 lib/Test/More.pm		More utilities for writing tests
 lib/Test.pm			A simple framework for writing test scripts
 lib/Test/Simple/Changes		Test::Simple changes
diff --git a/lib/Test/Harness/Changes b/ext/Test/Harness/Changes
index 2051eab790..2051eab790 100644
--- a/lib/Test/Harness/Changes
+++ b/ext/Test/Harness/Changes
diff --git a/ext/Test/Harness/Makefile.PL b/ext/Test/Harness/Makefile.PL
new file mode 100644
index 0000000000..e6e34c3074
--- /dev/null
+++ b/ext/Test/Harness/Makefile.PL
@@ -0,0 +1,49 @@
+#!/usr/bin/perl -w
+
+# This Makefile.PL is provided for installation compatibility.
+# Extra developer actions are in the Build.PL.
+
+use ExtUtils::MakeMaker qw/WriteMakefile prompt/;
+
+use strict;
+
+my $core = grep { $_ eq 'PERL_CORE=1' } @ARGV;
+
+my %mm_args = (
+    'NAME'         => 'Test::Harness',
+    'VERSION_FROM' => 'lib/Test/Harness.pm',
+    'PREREQ_PM'    => {
+        'File::Spec' => 0.8,
+    },
+    'INSTALLDIRS' => 'perl',
+    'PL_FILES'    => {},
+    'test'        => { 'TESTS' => 't/*.t t/compat/*.t' },
+    # In the core pods will be built by installman, and prove found by
+    # utils/prove.PL
+    $core ? (
+    'MAN3PODS'    => {}
+    ) : (
+    'EXE_FILES'   => ['bin/prove'],
+    ),
+);
+
+{
+    local $^W = 0;    # Silence warning about non-numeric version
+    if ( $ExtUtils::MakeMaker::VERSION >= '6.31' ) {
+        $mm_args{LICENSE} = 'perl';
+    }
+}
+
+WriteMakefile(%mm_args);
+
+package MY;
+
+# Lifted from MM_Any.pm and modified so that make test tests against our
+# own code rather than the incumbent. If we don't do this we end up
+# loading a confused mixture of installed and new modules.
+sub test_via_harness {
+    my ( $self, $perl, $tests ) = @_;
+
+    return $self->SUPER::test_via_harness(
+        qq{$perl "-I\$(INST_LIB)" "-I\$(INST_ARCHLIB)"}, $tests );
+}
diff --git a/lib/Test/Harness/bin/prove b/ext/Test/Harness/bin/prove
index ee31df8832..ee31df8832 100644
--- a/lib/Test/Harness/bin/prove
+++ b/ext/Test/Harness/bin/prove
diff --git a/lib/App/Prove.pm b/ext/Test/Harness/lib/App/Prove.pm
index b68ca40742..b68ca40742 100644
--- a/lib/App/Prove.pm
+++ b/ext/Test/Harness/lib/App/Prove.pm
diff --git a/lib/App/Prove/State.pm b/ext/Test/Harness/lib/App/Prove/State.pm
index aeac6433a0..aeac6433a0 100644
--- a/lib/App/Prove/State.pm
+++ b/ext/Test/Harness/lib/App/Prove/State.pm
diff --git a/lib/TAP/Base.pm b/ext/Test/Harness/lib/TAP/Base.pm
index 07450346f6..07450346f6 100644
--- a/lib/TAP/Base.pm
+++ b/ext/Test/Harness/lib/TAP/Base.pm
diff --git a/lib/TAP/Formatter/Color.pm b/ext/Test/Harness/lib/TAP/Formatter/Color.pm
index 532f2796c3..532f2796c3 100644
--- a/lib/TAP/Formatter/Color.pm
+++ b/ext/Test/Harness/lib/TAP/Formatter/Color.pm
diff --git a/lib/TAP/Formatter/Console.pm b/ext/Test/Harness/lib/TAP/Formatter/Console.pm
index 05384f0693..05384f0693 100644
--- a/lib/TAP/Formatter/Console.pm
+++ b/ext/Test/Harness/lib/TAP/Formatter/Console.pm
diff --git a/lib/TAP/Formatter/Console/ParallelSession.pm b/ext/Test/Harness/lib/TAP/Formatter/Console/ParallelSession.pm
index a509cf736a..a509cf736a 100644
--- a/lib/TAP/Formatter/Console/ParallelSession.pm
+++ b/ext/Test/Harness/lib/TAP/Formatter/Console/ParallelSession.pm
diff --git a/lib/TAP/Formatter/Console/Session.pm b/ext/Test/Harness/lib/TAP/Formatter/Console/Session.pm
index 0c14f00b6d..0c14f00b6d 100644
--- a/lib/TAP/Formatter/Console/Session.pm
+++ b/ext/Test/Harness/lib/TAP/Formatter/Console/Session.pm
diff --git a/lib/TAP/Harness.pm b/ext/Test/Harness/lib/TAP/Harness.pm
index 774152a8d7..774152a8d7 100644
--- a/lib/TAP/Harness.pm
+++ b/ext/Test/Harness/lib/TAP/Harness.pm
diff --git a/lib/TAP/Object.pm b/ext/Test/Harness/lib/TAP/Object.pm
index 71a0a88170..71a0a88170 100644
--- a/lib/TAP/Object.pm
+++ b/ext/Test/Harness/lib/TAP/Object.pm
diff --git a/lib/TAP/Parser.pm b/ext/Test/Harness/lib/TAP/Parser.pm
index 62a8b51125..62a8b51125 100644
--- a/lib/TAP/Parser.pm
+++ b/ext/Test/Harness/lib/TAP/Parser.pm
diff --git a/lib/TAP/Parser/Aggregator.pm b/ext/Test/Harness/lib/TAP/Parser/Aggregator.pm
index 5ed7fdb140..5ed7fdb140 100644
--- a/lib/TAP/Parser/Aggregator.pm
+++ b/ext/Test/Harness/lib/TAP/Parser/Aggregator.pm
diff --git a/lib/TAP/Parser/Grammar.pm b/ext/Test/Harness/lib/TAP/Parser/Grammar.pm
index d56d0cbdff..d56d0cbdff 100644
--- a/lib/TAP/Parser/Grammar.pm
+++ b/ext/Test/Harness/lib/TAP/Parser/Grammar.pm
diff --git a/lib/TAP/Parser/Iterator.pm b/ext/Test/Harness/lib/TAP/Parser/Iterator.pm
index 0d471d94e3..0d471d94e3 100644
--- a/lib/TAP/Parser/Iterator.pm
+++ b/ext/Test/Harness/lib/TAP/Parser/Iterator.pm
diff --git a/lib/TAP/Parser/Iterator/Array.pm b/ext/Test/Harness/lib/TAP/Parser/Iterator/Array.pm
index 3eef09a93b..3eef09a93b 100644
--- a/lib/TAP/Parser/Iterator/Array.pm
+++ b/ext/Test/Harness/lib/TAP/Parser/Iterator/Array.pm
diff --git a/lib/TAP/Parser/Iterator/Process.pm b/ext/Test/Harness/lib/TAP/Parser/Iterator/Process.pm
index bcc34205af..bcc34205af 100644
--- a/lib/TAP/Parser/Iterator/Process.pm
+++ b/ext/Test/Harness/lib/TAP/Parser/Iterator/Process.pm
diff --git a/lib/TAP/Parser/Iterator/Stream.pm b/ext/Test/Harness/lib/TAP/Parser/Iterator/Stream.pm
index 3f2febffd3..3f2febffd3 100644
--- a/lib/TAP/Parser/Iterator/Stream.pm
+++ b/ext/Test/Harness/lib/TAP/Parser/Iterator/Stream.pm
diff --git a/lib/TAP/Parser/IteratorFactory.pm b/ext/Test/Harness/lib/TAP/Parser/IteratorFactory.pm
index b2c1cddcd7..b2c1cddcd7 100644
--- a/lib/TAP/Parser/IteratorFactory.pm
+++ b/ext/Test/Harness/lib/TAP/Parser/IteratorFactory.pm
diff --git a/lib/TAP/Parser/Multiplexer.pm b/ext/Test/Harness/lib/TAP/Parser/Multiplexer.pm
index f57275687c..f57275687c 100644
--- a/lib/TAP/Parser/Multiplexer.pm
+++ b/ext/Test/Harness/lib/TAP/Parser/Multiplexer.pm
diff --git a/lib/TAP/Parser/Result.pm b/ext/Test/Harness/lib/TAP/Parser/Result.pm
index eb27a19846..eb27a19846 100644
--- a/lib/TAP/Parser/Result.pm
+++ b/ext/Test/Harness/lib/TAP/Parser/Result.pm
diff --git a/lib/TAP/Parser/Result/Bailout.pm b/ext/Test/Harness/lib/TAP/Parser/Result/Bailout.pm
index b20d03165d..b20d03165d 100644
--- a/lib/TAP/Parser/Result/Bailout.pm
+++ b/ext/Test/Harness/lib/TAP/Parser/Result/Bailout.pm
diff --git a/lib/TAP/Parser/Result/Comment.pm b/ext/Test/Harness/lib/TAP/Parser/Result/Comment.pm
index aaa78da443..aaa78da443 100644
--- a/lib/TAP/Parser/Result/Comment.pm
+++ b/ext/Test/Harness/lib/TAP/Parser/Result/Comment.pm
diff --git a/lib/TAP/Parser/Result/Plan.pm b/ext/Test/Harness/lib/TAP/Parser/Result/Plan.pm
index c851f2259f..c851f2259f 100644
--- a/lib/TAP/Parser/Result/Plan.pm
+++ b/ext/Test/Harness/lib/TAP/Parser/Result/Plan.pm
diff --git a/lib/TAP/Parser/Result/Pragma.pm b/ext/Test/Harness/lib/TAP/Parser/Result/Pragma.pm
index b89c713167..b89c713167 100644
--- a/lib/TAP/Parser/Result/Pragma.pm
+++ b/ext/Test/Harness/lib/TAP/Parser/Result/Pragma.pm
diff --git a/lib/TAP/Parser/Result/Test.pm b/ext/Test/Harness/lib/TAP/Parser/Result/Test.pm
index b36a7cecb7..b36a7cecb7 100644
--- a/lib/TAP/Parser/Result/Test.pm
+++ b/ext/Test/Harness/lib/TAP/Parser/Result/Test.pm
diff --git a/lib/TAP/Parser/Result/Unknown.pm b/ext/Test/Harness/lib/TAP/Parser/Result/Unknown.pm
index 47c888e843..47c888e843 100644
--- a/lib/TAP/Parser/Result/Unknown.pm
+++ b/ext/Test/Harness/lib/TAP/Parser/Result/Unknown.pm
diff --git a/lib/TAP/Parser/Result/Version.pm b/ext/Test/Harness/lib/TAP/Parser/Result/Version.pm
index 62bac2e534..62bac2e534 100644
--- a/lib/TAP/Parser/Result/Version.pm
+++ b/ext/Test/Harness/lib/TAP/Parser/Result/Version.pm
diff --git a/lib/TAP/Parser/Result/YAML.pm b/ext/Test/Harness/lib/TAP/Parser/Result/YAML.pm
index f1b99eff70..f1b99eff70 100644
--- a/lib/TAP/Parser/Result/YAML.pm
+++ b/ext/Test/Harness/lib/TAP/Parser/Result/YAML.pm
diff --git a/lib/TAP/Parser/ResultFactory.pm b/ext/Test/Harness/lib/TAP/Parser/ResultFactory.pm
index bf4797f20f..bf4797f20f 100644
--- a/lib/TAP/Parser/ResultFactory.pm
+++ b/ext/Test/Harness/lib/TAP/Parser/ResultFactory.pm
diff --git a/lib/TAP/Parser/Scheduler.pm b/ext/Test/Harness/lib/TAP/Parser/Scheduler.pm
index e0dea7607e..e0dea7607e 100644
--- a/lib/TAP/Parser/Scheduler.pm
+++ b/ext/Test/Harness/lib/TAP/Parser/Scheduler.pm
diff --git a/lib/TAP/Parser/Scheduler/Job.pm b/ext/Test/Harness/lib/TAP/Parser/Scheduler/Job.pm
index 2dc05e0a3c..2dc05e0a3c 100644
--- a/lib/TAP/Parser/Scheduler/Job.pm
+++ b/ext/Test/Harness/lib/TAP/Parser/Scheduler/Job.pm
diff --git a/lib/TAP/Parser/Scheduler/Spinner.pm b/ext/Test/Harness/lib/TAP/Parser/Scheduler/Spinner.pm
index 6a0fa60f78..6a0fa60f78 100644
--- a/lib/TAP/Parser/Scheduler/Spinner.pm
+++ b/ext/Test/Harness/lib/TAP/Parser/Scheduler/Spinner.pm
diff --git a/lib/TAP/Parser/Source.pm b/ext/Test/Harness/lib/TAP/Parser/Source.pm
index 9fc97a9e78..9fc97a9e78 100644
--- a/lib/TAP/Parser/Source.pm
+++ b/ext/Test/Harness/lib/TAP/Parser/Source.pm
diff --git a/lib/TAP/Parser/Source/Perl.pm b/ext/Test/Harness/lib/TAP/Parser/Source/Perl.pm
index fd60a768ed..fd60a768ed 100644
--- a/lib/TAP/Parser/Source/Perl.pm
+++ b/ext/Test/Harness/lib/TAP/Parser/Source/Perl.pm
diff --git a/lib/TAP/Parser/Utils.pm b/ext/Test/Harness/lib/TAP/Parser/Utils.pm
index 837c63e7ec..837c63e7ec 100644
--- a/lib/TAP/Parser/Utils.pm
+++ b/ext/Test/Harness/lib/TAP/Parser/Utils.pm
diff --git a/lib/TAP/Parser/YAMLish/Reader.pm b/ext/Test/Harness/lib/TAP/Parser/YAMLish/Reader.pm
index fca56de3c8..fca56de3c8 100644
--- a/lib/TAP/Parser/YAMLish/Reader.pm
+++ b/ext/Test/Harness/lib/TAP/Parser/YAMLish/Reader.pm
diff --git a/lib/TAP/Parser/YAMLish/Writer.pm b/ext/Test/Harness/lib/TAP/Parser/YAMLish/Writer.pm
index 5889ac1717..5889ac1717 100644
--- a/lib/TAP/Parser/YAMLish/Writer.pm
+++ b/ext/Test/Harness/lib/TAP/Parser/YAMLish/Writer.pm
diff --git a/lib/Test/Harness.pm b/ext/Test/Harness/lib/Test/Harness.pm
index 4f0164eee3..4f0164eee3 100644
--- a/lib/Test/Harness.pm
+++ b/ext/Test/Harness/lib/Test/Harness.pm
diff --git a/lib/Test/Harness/t/000-load.t b/ext/Test/Harness/t/000-load.t
index c6d6a92531..c6d6a92531 100644
--- a/lib/Test/Harness/t/000-load.t
+++ b/ext/Test/Harness/t/000-load.t
diff --git a/lib/Test/Harness/t/aggregator.t b/ext/Test/Harness/t/aggregator.t
index b3aff2a21f..b3aff2a21f 100644
--- a/lib/Test/Harness/t/aggregator.t
+++ b/ext/Test/Harness/t/aggregator.t
diff --git a/lib/Test/Harness/t/bailout.t b/ext/Test/Harness/t/bailout.t
index e10b133e0f..e10b133e0f 100755
--- a/lib/Test/Harness/t/bailout.t
+++ b/ext/Test/Harness/t/bailout.t
diff --git a/lib/Test/Harness/t/base.t b/ext/Test/Harness/t/base.t
index 4fee54844e..4fee54844e 100644
--- a/lib/Test/Harness/t/base.t
+++ b/ext/Test/Harness/t/base.t
diff --git a/lib/Test/Harness/t/callbacks.t b/ext/Test/Harness/t/callbacks.t
index 9d0cae46c5..9d0cae46c5 100644
--- a/lib/Test/Harness/t/callbacks.t
+++ b/ext/Test/Harness/t/callbacks.t
diff --git a/lib/Test/Harness/t/compat/env.t b/ext/Test/Harness/t/compat/env.t
index ac5c096213..ac5c096213 100644
--- a/lib/Test/Harness/t/compat/env.t
+++ b/ext/Test/Harness/t/compat/env.t
diff --git a/lib/Test/Harness/t/compat/failure.t b/ext/Test/Harness/t/compat/failure.t
index c1b902bab0..c1b902bab0 100644
--- a/lib/Test/Harness/t/compat/failure.t
+++ b/ext/Test/Harness/t/compat/failure.t
diff --git a/lib/Test/Harness/t/compat/inc-propagation.t b/ext/Test/Harness/t/compat/inc-propagation.t
index ffa53700a1..ffa53700a1 100644
--- a/lib/Test/Harness/t/compat/inc-propagation.t
+++ b/ext/Test/Harness/t/compat/inc-propagation.t
diff --git a/lib/Test/Harness/t/compat/inc_taint.t b/ext/Test/Harness/t/compat/inc_taint.t
index 06a8e237bd..06a8e237bd 100644
--- a/lib/Test/Harness/t/compat/inc_taint.t
+++ b/ext/Test/Harness/t/compat/inc_taint.t
diff --git a/lib/Test/Harness/t/compat/nonumbers.t b/ext/Test/Harness/t/compat/nonumbers.t
index 144a7599b2..144a7599b2 100644
--- a/lib/Test/Harness/t/compat/nonumbers.t
+++ b/ext/Test/Harness/t/compat/nonumbers.t
diff --git a/lib/Test/Harness/t/compat/regression.t b/ext/Test/Harness/t/compat/regression.t
index 1d848f9174..1d848f9174 100644
--- a/lib/Test/Harness/t/compat/regression.t
+++ b/ext/Test/Harness/t/compat/regression.t
diff --git a/lib/Test/Harness/t/compat/test-harness-compat.t b/ext/Test/Harness/t/compat/test-harness-compat.t
index 480d6d8d70..480d6d8d70 100644
--- a/lib/Test/Harness/t/compat/test-harness-compat.t
+++ b/ext/Test/Harness/t/compat/test-harness-compat.t
diff --git a/lib/Test/Harness/t/compat/version.t b/ext/Test/Harness/t/compat/version.t
index 08344cbd9c..08344cbd9c 100644
--- a/lib/Test/Harness/t/compat/version.t
+++ b/ext/Test/Harness/t/compat/version.t
diff --git a/lib/Test/Harness/t/console.t b/ext/Test/Harness/t/console.t
index 32f5db62ac..32f5db62ac 100644
--- a/lib/Test/Harness/t/console.t
+++ b/ext/Test/Harness/t/console.t
diff --git a/lib/Test/Harness/t/errors.t b/ext/Test/Harness/t/errors.t
index 3a54cbe066..3a54cbe066 100644
--- a/lib/Test/Harness/t/errors.t
+++ b/ext/Test/Harness/t/errors.t
diff --git a/lib/Test/Harness/t/grammar.t b/ext/Test/Harness/t/grammar.t
index f1521ede5e..f1521ede5e 100644
--- a/lib/Test/Harness/t/grammar.t
+++ b/ext/Test/Harness/t/grammar.t
diff --git a/lib/Test/Harness/t/harness.t b/ext/Test/Harness/t/harness.t
index 70ff42e452..70ff42e452 100644
--- a/lib/Test/Harness/t/harness.t
+++ b/ext/Test/Harness/t/harness.t
diff --git a/lib/Test/Harness/t/iterators.t b/ext/Test/Harness/t/iterators.t
index 11b2899b12..11b2899b12 100644
--- a/lib/Test/Harness/t/iterators.t
+++ b/ext/Test/Harness/t/iterators.t
diff --git a/lib/Test/Harness/t/multiplexer.t b/ext/Test/Harness/t/multiplexer.t
index dd988dcee1..dd988dcee1 100644
--- a/lib/Test/Harness/t/multiplexer.t
+++ b/ext/Test/Harness/t/multiplexer.t
diff --git a/lib/Test/Harness/t/nofork-mux.t b/ext/Test/Harness/t/nofork-mux.t
index 23a0746176..5751945076 100644
--- a/lib/Test/Harness/t/nofork-mux.t
+++ b/ext/Test/Harness/t/nofork-mux.t
@@ -14,4 +14,4 @@ use strict;
 
 use NoFork;
 require(
-    ( $ENV{PERL_CORE} ? '../lib/Test/Harness/' : '' ) . 't/multiplexer.t' );
+    ( $ENV{PERL_CORE} ? '../ext/Test/Harness/' : '' ) . 't/multiplexer.t' );
diff --git a/lib/Test/Harness/t/nofork.t b/ext/Test/Harness/t/nofork.t
index 6a45e503c8..6a45e503c8 100755
--- a/lib/Test/Harness/t/nofork.t
+++ b/ext/Test/Harness/t/nofork.t
diff --git a/lib/Test/Harness/t/object.t b/ext/Test/Harness/t/object.t
index b1a4dd0b98..b1a4dd0b98 100644
--- a/lib/Test/Harness/t/object.t
+++ b/ext/Test/Harness/t/object.t
diff --git a/lib/Test/Harness/t/parse.t b/ext/Test/Harness/t/parse.t
index 7118199a51..7118199a51 100755
--- a/lib/Test/Harness/t/parse.t
+++ b/ext/Test/Harness/t/parse.t
diff --git a/lib/Test/Harness/t/parser-config.t b/ext/Test/Harness/t/parser-config.t
index cf0a246a03..cf0a246a03 100644
--- a/lib/Test/Harness/t/parser-config.t
+++ b/ext/Test/Harness/t/parser-config.t
diff --git a/lib/Test/Harness/t/parser-subclass.t b/ext/Test/Harness/t/parser-subclass.t
index f522f89aff..f522f89aff 100644
--- a/lib/Test/Harness/t/parser-subclass.t
+++ b/ext/Test/Harness/t/parser-subclass.t
diff --git a/lib/Test/Harness/t/premature-bailout.t b/ext/Test/Harness/t/premature-bailout.t
index 9226a44064..9226a44064 100644
--- a/lib/Test/Harness/t/premature-bailout.t
+++ b/ext/Test/Harness/t/premature-bailout.t
diff --git a/lib/Test/Harness/t/process.t b/ext/Test/Harness/t/process.t
index 5adddc9017..5adddc9017 100644
--- a/lib/Test/Harness/t/process.t
+++ b/ext/Test/Harness/t/process.t
diff --git a/lib/Test/Harness/t/prove.t b/ext/Test/Harness/t/prove.t
index 38b9b85097..38b9b85097 100644
--- a/lib/Test/Harness/t/prove.t
+++ b/ext/Test/Harness/t/prove.t
diff --git a/lib/Test/Harness/t/proveenv.t b/ext/Test/Harness/t/proveenv.t
index be9942a043..be9942a043 100644
--- a/lib/Test/Harness/t/proveenv.t
+++ b/ext/Test/Harness/t/proveenv.t
diff --git a/lib/Test/Harness/t/proverc.t b/ext/Test/Harness/t/proverc.t
index 2577250532..2577250532 100644
--- a/lib/Test/Harness/t/proverc.t
+++ b/ext/Test/Harness/t/proverc.t
diff --git a/lib/Test/Harness/t/proverun.t b/ext/Test/Harness/t/proverun.t
index b40d56362d..b40d56362d 100644
--- a/lib/Test/Harness/t/proverun.t
+++ b/ext/Test/Harness/t/proverun.t
diff --git a/lib/Test/Harness/t/regression.t b/ext/Test/Harness/t/regression.t
index c029a050a9..c029a050a9 100644
--- a/lib/Test/Harness/t/regression.t
+++ b/ext/Test/Harness/t/regression.t
diff --git a/lib/Test/Harness/t/results.t b/ext/Test/Harness/t/results.t
index 0522dd6299..0522dd6299 100644
--- a/lib/Test/Harness/t/results.t
+++ b/ext/Test/Harness/t/results.t
diff --git a/lib/Test/Harness/t/scheduler.t b/ext/Test/Harness/t/scheduler.t
index b2742078b1..b2742078b1 100644
--- a/lib/Test/Harness/t/scheduler.t
+++ b/ext/Test/Harness/t/scheduler.t
diff --git a/lib/Test/Harness/t/source.t b/ext/Test/Harness/t/source.t
index 8f7e60f2e3..8f7e60f2e3 100644
--- a/lib/Test/Harness/t/source.t
+++ b/ext/Test/Harness/t/source.t
diff --git a/lib/Test/Harness/t/spool.t b/ext/Test/Harness/t/spool.t
index deb1a0205f..deb1a0205f 100644
--- a/lib/Test/Harness/t/spool.t
+++ b/ext/Test/Harness/t/spool.t
diff --git a/lib/Test/Harness/t/state.t b/ext/Test/Harness/t/state.t
index 7ec4cfd611..e6bfb7c318 100644
--- a/lib/Test/Harness/t/state.t
+++ b/ext/Test/Harness/t/state.t
@@ -15,7 +15,7 @@ use Test::More;
 use App::Prove::State;
 
 sub mn {
-    my $pfx = $ENV{PERL_CORE} ? '../lib/Test/Harness/' : '';
+    my $pfx = $ENV{PERL_CORE} ? '../ext/Test/Harness/' : '';
     return map {"$pfx$_"} @_;
 }
 
diff --git a/lib/Test/Harness/t/streams.t b/ext/Test/Harness/t/streams.t
index b312ae8367..b312ae8367 100755
--- a/lib/Test/Harness/t/streams.t
+++ b/ext/Test/Harness/t/streams.t
diff --git a/lib/Test/Harness/t/taint.t b/ext/Test/Harness/t/taint.t
index 91335ac170..91335ac170 100644
--- a/lib/Test/Harness/t/taint.t
+++ b/ext/Test/Harness/t/taint.t
diff --git a/lib/Test/Harness/t/testargs.t b/ext/Test/Harness/t/testargs.t
index 9160c5909b..9160c5909b 100644
--- a/lib/Test/Harness/t/testargs.t
+++ b/ext/Test/Harness/t/testargs.t
diff --git a/lib/Test/Harness/t/unicode.t b/ext/Test/Harness/t/unicode.t
index 88d32081ba..88d32081ba 100644
--- a/lib/Test/Harness/t/unicode.t
+++ b/ext/Test/Harness/t/unicode.t
diff --git a/lib/Test/Harness/t/utils.t b/ext/Test/Harness/t/utils.t
index d60c8a2939..d60c8a2939 100644
--- a/lib/Test/Harness/t/utils.t
+++ b/ext/Test/Harness/t/utils.t
diff --git a/lib/Test/Harness/t/yamlish-output.t b/ext/Test/Harness/t/yamlish-output.t
index 914d7ea237..914d7ea237 100644
--- a/lib/Test/Harness/t/yamlish-output.t
+++ b/ext/Test/Harness/t/yamlish-output.t
diff --git a/lib/Test/Harness/t/yamlish-writer.t b/ext/Test/Harness/t/yamlish-writer.t
index f7a22c3dab..f7a22c3dab 100644
--- a/lib/Test/Harness/t/yamlish-writer.t
+++ b/ext/Test/Harness/t/yamlish-writer.t
diff --git a/lib/Test/Harness/t/yamlish.t b/ext/Test/Harness/t/yamlish.t
index 76ba7982b4..76ba7982b4 100644
--- a/lib/Test/Harness/t/yamlish.t
+++ b/ext/Test/Harness/t/yamlish.t
diff --git a/utils/prove.PL b/utils/prove.PL
index d1961c8725..91a42e3e69 100644
--- a/utils/prove.PL
+++ b/utils/prove.PL
@@ -34,7 +34,7 @@ $Config{startperl}
 use File::Spec;
 
 my $prove = File::Spec->catfile(File::Spec->catdir(File::Spec->updir,
-	"lib", "Test", "Harness", "bin"), "prove");
+	"ext", "Test", "Harness", "bin"), "prove");
 
 if (open(PROVE, $prove)) {
     print OUT <PROVE>;