From: Nicholas Clark <nick@ccl4.org>
Date: Tue, 26 Aug 2008 10:51:53 +0000 (+0000)
Subject: Move t/lib/{data,sample-tests,source_tests,subclass_tests} into
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=fbd6575c915bb6c2521a5086fde2a0e1607c6f01;p=p5sagit%2Fp5-mst-13.2.git

Move t/lib/{data,sample-tests,source_tests,subclass_tests} into
ext/Test/Harness/t/{data,sample-tests,source_tests,subclass_tests}
(The same path as in the Test-Harness distribution.)

p4raw-id: //depot/perl@34227
---

diff --git a/MANIFEST b/MANIFEST
index 12a6474..8b59e69 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -1175,6 +1175,9 @@ 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/data/catme.1				Test data for Test::Harness
+ext/Test/Harness/t/data/proverc				Test data for Test::Harness
+ext/Test/Harness/t/data/sample.yml			Test data for Test::Harness
 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
@@ -1194,11 +1197,73 @@ 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/sample-tests/bailout			Test data for Test::Harness
+ext/Test/Harness/t/sample-tests/bignum			Test data for Test::Harness
+ext/Test/Harness/t/sample-tests/bignum_many		Test data for Test::Harness
+ext/Test/Harness/t/sample-tests/combined		Test data for Test::Harness
+ext/Test/Harness/t/sample-tests/combined_compat		Test data for Test::Harness
+ext/Test/Harness/t/sample-tests/delayed			Test data for Test::Harness
+ext/Test/Harness/t/sample-tests/descriptive		Test data for Test::Harness
+ext/Test/Harness/t/sample-tests/descriptive_trailing	Test data for Test::Harness
+ext/Test/Harness/t/sample-tests/die			Test data for Test::Harness
+ext/Test/Harness/t/sample-tests/die_head_end		Test data for Test::Harness
+ext/Test/Harness/t/sample-tests/die_last_minute		Test data for Test::Harness
+ext/Test/Harness/t/sample-tests/die_unfinished		Test data for Test::Harness
+ext/Test/Harness/t/sample-tests/duplicates		Test data for Test::Harness
+ext/Test/Harness/t/sample-tests/echo			Test data for Test::Harness
+ext/Test/Harness/t/sample-tests/empty			Test data for Test::Harness
+ext/Test/Harness/t/sample-tests/escape_eol		Test data for Test::Harness
+ext/Test/Harness/t/sample-tests/escape_hash		Test data for Test::Harness
+ext/Test/Harness/t/sample-tests/head_end		Test data for Test::Harness
+ext/Test/Harness/t/sample-tests/head_fail		Test data for Test::Harness
+ext/Test/Harness/t/sample-tests/inc_taint		Test data for Test::Harness
+ext/Test/Harness/t/sample-tests/junk_before_plan	Test data for Test::Harness
+ext/Test/Harness/t/sample-tests/lone_not_bug		Test data for Test::Harness
+ext/Test/Harness/t/sample-tests/no_nums			Test data for Test::Harness
+ext/Test/Harness/t/sample-tests/no_output		Test data for Test::Harness
+ext/Test/Harness/t/sample-tests/out_err_mix		Test data for Test::Harness
+ext/Test/Harness/t/sample-tests/out_of_order		Test data for Test::Harness
+ext/Test/Harness/t/sample-tests/schwern			Test data for Test::Harness
+ext/Test/Harness/t/sample-tests/schwern-todo-quiet	Test data for Test::Harness
+ext/Test/Harness/t/sample-tests/segfault		Test data for Test::Harness
+ext/Test/Harness/t/sample-tests/sequence_misparse	Test data for Test::Harness
+ext/Test/Harness/t/sample-tests/shbang_misparse		Test data for Test::Harness
+ext/Test/Harness/t/sample-tests/simple			Test data for Test::Harness
+ext/Test/Harness/t/sample-tests/simple_fail		Test data for Test::Harness
+ext/Test/Harness/t/sample-tests/simple_yaml		Test data for Test::Harness
+ext/Test/Harness/t/sample-tests/skip			Test data for Test::Harness
+ext/Test/Harness/t/sample-tests/skipall			Test data for Test::Harness
+ext/Test/Harness/t/sample-tests/skipall_nomsg		Test data for Test::Harness
+ext/Test/Harness/t/sample-tests/skipall_v13		Test data for Test::Harness
+ext/Test/Harness/t/sample-tests/skip_nomsg		Test data for Test::Harness
+ext/Test/Harness/t/sample-tests/space_after_plan	Test data for Test::Harness
+ext/Test/Harness/t/sample-tests/stdout_stderr		Test data for Test::Harness
+ext/Test/Harness/t/sample-tests/strict			Test data for Test::Harness
+ext/Test/Harness/t/sample-tests/switches		Test data for Test::Harness
+ext/Test/Harness/t/sample-tests/taint			Test data for Test::Harness
+ext/Test/Harness/t/sample-tests/taint_warn		Test data for Test::Harness
+ext/Test/Harness/t/sample-tests/todo			Test data for Test::Harness
+ext/Test/Harness/t/sample-tests/todo_inline		Test data for Test::Harness
+ext/Test/Harness/t/sample-tests/todo_misparse		Test data for Test::Harness
+ext/Test/Harness/t/sample-tests/too_many		Test data for Test::Harness
+ext/Test/Harness/t/sample-tests/version_good		Test data for Test::Harness
+ext/Test/Harness/t/sample-tests/version_late		Test data for Test::Harness
+ext/Test/Harness/t/sample-tests/version_old		Test data for Test::Harness
+ext/Test/Harness/t/sample-tests/vms_nit			Test data for Test::Harness
+ext/Test/Harness/t/sample-tests/with_comments		Test data for Test::Harness
 ext/Test/Harness/t/scheduler.t				Test::Harness test
 ext/Test/Harness/t/source.t				Test::Harness test
+ext/Test/Harness/t/source_tests/harness			Test data for Test::Harness
+ext/Test/Harness/t/source_tests/harness_badtap		Test data for Test::Harness
+ext/Test/Harness/t/source_tests/harness_complain	Test data for Test::Harness
+ext/Test/Harness/t/source_tests/harness_directives	Test data for Test::Harness
+ext/Test/Harness/t/source_tests/harness_failure		Test data for Test::Harness
+ext/Test/Harness/t/source_tests/source			Test data for Test::Harness
 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/subclass_tests/non_perl_source	Test data for Test::Harness
+ext/Test/Harness/t/subclass_tests/perl_source		Test data for Test::Harness
 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
@@ -3599,9 +3664,6 @@ t/lib/compress/truncate.pl	Compress::Zlib
 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/data/catme.1			Test data for Test::Harness
-t/lib/data/proverc			Test data for Test::Harness
-t/lib/data/sample.yml			Test data for Test::Harness
 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
@@ -3662,72 +3724,10 @@ 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/sample-tests/bailout		Test data for Test::Harness
-t/lib/sample-tests/bignum		Test data for Test::Harness
-t/lib/sample-tests/bignum_many		Test data for Test::Harness
-t/lib/sample-tests/combined		Test data for Test::Harness
-t/lib/sample-tests/combined_compat	Test data for Test::Harness
-t/lib/sample-tests/delayed		Test data for Test::Harness
-t/lib/sample-tests/descriptive		Test data for Test::Harness
-t/lib/sample-tests/descriptive_trailing	Test data for Test::Harness
-t/lib/sample-tests/die			Test data for Test::Harness
-t/lib/sample-tests/die_head_end		Test data for Test::Harness
-t/lib/sample-tests/die_last_minute	Test data for Test::Harness
-t/lib/sample-tests/die_unfinished	Test data for Test::Harness
-t/lib/sample-tests/duplicates		Test data for Test::Harness
-t/lib/sample-tests/echo			Test data for Test::Harness
-t/lib/sample-tests/empty		Test data for Test::Harness
-t/lib/sample-tests/escape_eol		Test data for Test::Harness
-t/lib/sample-tests/escape_hash		Test data for Test::Harness
-t/lib/sample-tests/head_end		Test data for Test::Harness
-t/lib/sample-tests/head_fail		Test data for Test::Harness
-t/lib/sample-tests/inc_taint		Test data for Test::Harness
-t/lib/sample-tests/junk_before_plan	Test data for Test::Harness
-t/lib/sample-tests/lone_not_bug		Test data for Test::Harness
-t/lib/sample-tests/no_nums		Test data for Test::Harness
-t/lib/sample-tests/no_output		Test data for Test::Harness
-t/lib/sample-tests/out_err_mix		Test data for Test::Harness
-t/lib/sample-tests/out_of_order		Test data for Test::Harness
-t/lib/sample-tests/schwern		Test data for Test::Harness
-t/lib/sample-tests/schwern-todo-quiet	Test data for Test::Harness
-t/lib/sample-tests/segfault		Test data for Test::Harness
-t/lib/sample-tests/sequence_misparse	Test data for Test::Harness
-t/lib/sample-tests/shbang_misparse	Test data for Test::Harness
-t/lib/sample-tests/simple		Test data for Test::Harness
-t/lib/sample-tests/simple_fail		Test data for Test::Harness
-t/lib/sample-tests/simple_yaml		Test data for Test::Harness
-t/lib/sample-tests/skip			Test data for Test::Harness
-t/lib/sample-tests/skipall		Test data for Test::Harness
-t/lib/sample-tests/skipall_nomsg	Test data for Test::Harness
-t/lib/sample-tests/skipall_v13		Test data for Test::Harness
-t/lib/sample-tests/skip_nomsg		Test data for Test::Harness
-t/lib/sample-tests/space_after_plan	Test data for Test::Harness
-t/lib/sample-tests/stdout_stderr	Test data for Test::Harness
-t/lib/sample-tests/strict		Test data for Test::Harness
-t/lib/sample-tests/switches		Test data for Test::Harness
-t/lib/sample-tests/taint		Test data for Test::Harness
-t/lib/sample-tests/taint_warn		Test data for Test::Harness
-t/lib/sample-tests/todo			Test data for Test::Harness
-t/lib/sample-tests/todo_inline		Test data for Test::Harness
-t/lib/sample-tests/todo_misparse	Test data for Test::Harness
-t/lib/sample-tests/too_many		Test data for Test::Harness
-t/lib/sample-tests/version_good		Test data for Test::Harness
-t/lib/sample-tests/version_late		Test data for Test::Harness
-t/lib/sample-tests/version_old		Test data for Test::Harness
-t/lib/sample-tests/vms_nit		Test data for Test::Harness
-t/lib/sample-tests/with_comments	Test data for Test::Harness
 t/lib/Sans_mypragma.pm			Test module for t/lib/mypragma.t
-t/lib/source_tests/harness		Test data for Test::Harness
-t/lib/source_tests/harness_badtap	Test data for Test::Harness
-t/lib/source_tests/harness_complain	Test data for Test::Harness
-t/lib/source_tests/harness_directives	Test data for Test::Harness
-t/lib/source_tests/harness_failure	Test data for Test::Harness
-t/lib/source_tests/source		Test data for Test::Harness
 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/subclass_tests/non_perl_source	Test data for Test::Harness
-t/lib/subclass_tests/perl_source	Test data for Test::Harness
 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
diff --git a/Porting/Maintainers.pl b/Porting/Maintainers.pl
index db9c23e..5a7fbe0 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/data t/lib/sample-tests 
-				     t/lib/source_tests t/lib/Dev/Null.pm
+		'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],
 		'CPAN'		=> 1,
diff --git a/ext/Test/Harness/t/compat/failure.t b/ext/Test/Harness/t/compat/failure.t
index c1b902b..b164f9b 100644
--- a/ext/Test/Harness/t/compat/failure.t
+++ b/ext/Test/Harness/t/compat/failure.t
@@ -19,11 +19,14 @@ use Test::Harness;
         return sub { $died = 1 }
     }
 
-    my $curdir = File::Spec->curdir;
-    my $sample_tests
-      = $ENV{PERL_CORE}
-      ? File::Spec->catdir( $curdir, 'lib', 'sample-tests' )
-      : File::Spec->catdir( $curdir, 't',   'sample-tests' );
+    my $sample_tests;
+    if ($ENV{PERL_CORE}) {
+	my $updir = File::Spec->updir;
+	$sample_tests = File::Spec->catdir( $updir, 'ext', 'Test', 'Harness', 't', 'sample-tests' );
+    } else {
+	my $curdir = File::Spec->curdir;
+	$sample_tests = File::Spec->catdir( $curdir, 't', 'sample-tests' );
+    }
 
     {
         local $SIG{__DIE__} = prepare_for_death();
diff --git a/ext/Test/Harness/t/compat/inc_taint.t b/ext/Test/Harness/t/compat/inc_taint.t
index 06a8e23..bdb0d73 100644
--- a/ext/Test/Harness/t/compat/inc_taint.t
+++ b/ext/Test/Harness/t/compat/inc_taint.t
@@ -35,7 +35,7 @@ sub _all_ok {
     my ( $tot, $failed ) = Test::Harness::execute_tests(
         tests => [
             $ENV{PERL_CORE}
-            ? 'lib/sample-tests/inc_taint'
+            ? '../ext/Test/Harness/t/sample-tests/inc_taint'
             : 't/sample-tests/inc_taint'
         ]
     );
diff --git a/t/lib/data/catme.1 b/ext/Test/Harness/t/data/catme.1
similarity index 100%
rename from t/lib/data/catme.1
rename to ext/Test/Harness/t/data/catme.1
diff --git a/t/lib/data/proverc b/ext/Test/Harness/t/data/proverc
similarity index 100%
rename from t/lib/data/proverc
rename to ext/Test/Harness/t/data/proverc
diff --git a/t/lib/data/sample.yml b/ext/Test/Harness/t/data/sample.yml
similarity index 100%
rename from t/lib/data/sample.yml
rename to ext/Test/Harness/t/data/sample.yml
diff --git a/ext/Test/Harness/t/harness.t b/ext/Test/Harness/t/harness.t
index 70ff42e..716ea59 100644
--- a/ext/Test/Harness/t/harness.t
+++ b/ext/Test/Harness/t/harness.t
@@ -19,8 +19,8 @@ use TAP::Harness;
 
 my $HARNESS = 'TAP::Harness';
 
-my $source_tests = $ENV{PERL_CORE} ? 'lib/source_tests' : 't/source_tests';
-my $sample_tests = $ENV{PERL_CORE} ? 'lib/sample-tests' : 't/sample-tests';
+my $source_tests = $ENV{PERL_CORE} ? '../ext/Test/Harness/t/source_tests' : 't/source_tests';
+my $sample_tests = $ENV{PERL_CORE} ? '../ext/Test/Harness/t/sample-tests' : 't/sample-tests';
 
 plan tests => 113;
 
@@ -523,7 +523,7 @@ SKIP: {
     eval {
         _runtests(
             $harness,
-            $ENV{PERL_CORE} ? 'lib/data/catme.1' : 't/data/catme.1'
+            $ENV{PERL_CORE} ? '../ext/Test/Harness/t/data/catme.1' : 't/data/catme.1'
         );
     };
 
@@ -810,7 +810,7 @@ sub _runtests {
 
     # coverage tests for the basically untested T::H::_open_spool
 
-    my @spool = ( $ENV{PERL_CORE} ? ('spool') : ( 't', 'spool' ) );
+    my @spool = ( ( $ENV{PERL_CORE} ? (File::Spec->updir(), 'ext', 'Test', 'Harness' ) : () ), ( 't', 'spool' ) );
     $ENV{PERL_TEST_HARNESS_DUMP_TAP} = File::Spec->catfile(@spool);
 
 # now given that we're going to be writing stuff to the file system, make sure we have
diff --git a/ext/Test/Harness/t/iterators.t b/ext/Test/Harness/t/iterators.t
index 11b2899..e4df510 100644
--- a/ext/Test/Harness/t/iterators.t
+++ b/ext/Test/Harness/t/iterators.t
@@ -42,8 +42,8 @@ my @schedule = (
             command => [
                 $^X,
                 File::Spec->catfile(
-                    ( $ENV{PERL_CORE} ? 'lib' : 't' ),
-                    'sample-tests', 'out_err_mix'
+                    ( $ENV{PERL_CORE} ? ( File::Spec->updir(), 'ext', 'Test', 'Harness' ) : () ),
+                    't', 'sample-tests', 'out_err_mix'
                 )
             ],
             merge    => 1,
diff --git a/ext/Test/Harness/t/multiplexer.t b/ext/Test/Harness/t/multiplexer.t
index dd988dc..eccbb0e 100644
--- a/ext/Test/Harness/t/multiplexer.t
+++ b/ext/Test/Harness/t/multiplexer.t
@@ -56,8 +56,8 @@ my @schedule = (
             return [
                 TAP::Parser->new(
                     {   source => File::Spec->catfile(
-                            ( $ENV{PERL_CORE} ? 'lib' : 't' ), 'sample-tests',
-                            'simple'
+                            ( $ENV{PERL_CORE} ? ( File::Spec->updir(), 'ext', 'Test', 'Harness' ) : () ),
+			    't', 'sample-tests', 'simple'
                         ),
                     }
                 ),
@@ -76,8 +76,8 @@ my @schedule = (
             return map {
                 [   TAP::Parser->new(
                         {   source => File::Spec->catfile(
-                                ( $ENV{PERL_CORE} ? 'lib' : 't' ),
-                                'sample-tests', 'simple'
+                                ( $ENV{PERL_CORE} ? ( File::Spec->updir(), 'ext', 'Test', 'Harness' ) : () ),
+                                't', 'sample-tests', 'simple'
                             ),
                         }
                     ),
@@ -116,8 +116,8 @@ my @schedule = (
               ( map {
                     [   TAP::Parser->new(
                             {   source => File::Spec->catfile(
-                                    ( $ENV{PERL_CORE} ? 'lib' : 't' ),
-                                    'sample-tests', 'simple'
+                                    ( $ENV{PERL_CORE} ? ( File::Spec->updir(), 'ext', 'Test', 'Harness' ) : () ),
+                                    't', 'sample-tests', 'simple'
                                 ),
                             }
                         ),
diff --git a/ext/Test/Harness/t/nofork.t b/ext/Test/Harness/t/nofork.t
index 6a45e50..7f27820 100755
--- a/ext/Test/Harness/t/nofork.t
+++ b/ext/Test/Harness/t/nofork.t
@@ -58,7 +58,7 @@ my $mod = 'TAP::Parser::Iterator::Process';
         }
     );
     $harness->runtests(
-        ( $ENV{PERL_CORE} ? 'lib' : 't' ) . '/sample-tests/simple' );
+        ( $ENV{PERL_CORE} ? '../ext/Test/Harness/' : '' ) . 't/sample-tests/simple' );
     my @output = tied($$capture)->dump;
     is pop @output, "Result: PASS\n", 'status OK';
     pop @output;    # get rid of summary line
diff --git a/ext/Test/Harness/t/parse.t b/ext/Test/Harness/t/parse.t
index 7118199..39f2c38 100755
--- a/ext/Test/Harness/t/parse.t
+++ b/ext/Test/Harness/t/parse.t
@@ -605,8 +605,8 @@ END_TAP
 
     my $parser = TAP::Parser->new(
         {   source => File::Spec->catfile(
-                ( $ENV{PERL_CORE} ? 'lib' : 't' ),
-                'sample-tests', 'simple'
+                ( $ENV{PERL_CORE} ? ( File::Spec->updir(), 'ext', 'Test', 'Harness' ) : () ),
+                't', 'sample-tests', 'simple'
             ),
         }
     );
diff --git a/ext/Test/Harness/t/parser-config.t b/ext/Test/Harness/t/parser-config.t
index cf0a246..0c74427 100644
--- a/ext/Test/Harness/t/parser-config.t
+++ b/ext/Test/Harness/t/parser-config.t
@@ -14,7 +14,7 @@ use strict;
 use vars qw(%INIT %CUSTOM);
 
 use Test::More tests => 11;
-use File::Spec::Functions qw( catfile );
+use File::Spec::Functions qw( catfile updir );
 use TAP::Parser;
 
 use_ok('MySource');
@@ -23,8 +23,8 @@ use_ok('MyGrammar');
 use_ok('MyIteratorFactory');
 use_ok('MyResultFactory');
 
-my $t_dir = $ENV{PERL_CORE} ? 'lib' : 't';
-my $source = catfile( $t_dir, 'source_tests', 'source' );
+my @t_path = $ENV{PERL_CORE} ? ( updir(), 'ext', 'Test', 'Harness' ) : ();
+my $source = catfile( @t_path, 't', 'source_tests', 'source' );
 my %customize = (
     source_class           => 'MySource',
     perl_source_class      => 'MyPerlSource',
diff --git a/ext/Test/Harness/t/parser-subclass.t b/ext/Test/Harness/t/parser-subclass.t
index f522f89..2817751 100644
--- a/ext/Test/Harness/t/parser-subclass.t
+++ b/ext/Test/Harness/t/parser-subclass.t
@@ -14,16 +14,16 @@ use strict;
 use vars qw(%INIT %CUSTOM);
 
 use Test::More tests => 24;
-use File::Spec::Functions qw( catfile );
+use File::Spec::Functions qw( catfile updir );
 
 use_ok('TAP::Parser::SubclassTest');
 
 # TODO: foreach my $source ( ... )
-my $t_dir = $ENV{PERL_CORE} ? 'lib' : 't';
+my @t_path = $ENV{PERL_CORE} ? ( updir(), 'ext', 'Test', 'Harness' ) : ();
 
 {    # perl source
     %INIT = %CUSTOM = ();
-    my $source = catfile( $t_dir, 'subclass_tests', 'perl_source' );
+    my $source = catfile( @t_path, 't', 'subclass_tests', 'perl_source' );
     my $p = TAP::Parser::SubclassTest->new( { source => $source } );
 
     # The grammar is lazily constructed so we need to ask for it to
@@ -78,7 +78,7 @@ SKIP: {    # non-perl source
     unless ( -e $cat ) {
         skip "no '$cat'", 4;
     }
-    my $file = catfile( $t_dir, 'data', 'catme.1' );
+    my $file = catfile( @t_path, 't', 'data', 'catme.1' );
     my $p = TAP::Parser::SubclassTest->new( { exec => [ $cat => $file ] } );
 
     is( $INIT{MySource},     1, 'initialized MySource subclass' );
diff --git a/ext/Test/Harness/t/process.t b/ext/Test/Harness/t/process.t
index 5adddc9..abebf69 100644
--- a/ext/Test/Harness/t/process.t
+++ b/ext/Test/Harness/t/process.t
@@ -28,8 +28,8 @@ my @expect = (
 );
 
 my $source = File::Spec->catfile(
-    ( $ENV{PERL_CORE} ? 'lib' : 't' ),
-    'sample-tests', 'delayed'
+    ( $ENV{PERL_CORE} ? ( File::Spec->updir(), 'ext', 'Test', 'Harness' ) : () ),
+    't', 'sample-tests', 'delayed'
 );
 
 for my $chunk_size ( 1, 4, 65536 ) {
diff --git a/ext/Test/Harness/t/proverc.t b/ext/Test/Harness/t/proverc.t
index 2577250..df4cbbb 100644
--- a/ext/Test/Harness/t/proverc.t
+++ b/ext/Test/Harness/t/proverc.t
@@ -20,7 +20,7 @@ my $prove = App::Prove->new;
 
 $prove->add_rc_file(
     File::Spec->catfile(
-        ( $ENV{PERL_CORE} ? 'lib' : 't' ), 'data', 'proverc'
+        ( $ENV{PERL_CORE} ? ( File::Spec->updir(), 'ext', 'Test', 'Harness' ) : () ), 't', 'data', 'proverc'
     )
 );
 
diff --git a/ext/Test/Harness/t/proverun.t b/ext/Test/Harness/t/proverun.t
index b40d563..7db0197 100644
--- a/ext/Test/Harness/t/proverun.t
+++ b/ext/Test/Harness/t/proverun.t
@@ -20,8 +20,8 @@ my @SCHEDULE;
 BEGIN {
 
     my $sample_test = File::Spec->catfile(
-        split /\//,
-        ( $ENV{PERL_CORE} ? 'lib' : 't' ) . '/sample-tests/simple'
+        ( $ENV{PERL_CORE} ? ( File::Spec->updir(), 'ext', 'Test', 'Harness' ) : () ), 
+        't', 'sample-tests', 'simple'
     );
 
     @SCHEDULE = (
diff --git a/ext/Test/Harness/t/regression.t b/ext/Test/Harness/t/regression.t
index c029a05..8f93e4e 100644
--- a/ext/Test/Harness/t/regression.t
+++ b/ext/Test/Harness/t/regression.t
@@ -30,8 +30,8 @@ my $IsWin32 = $^O eq 'MSWin32';
 
 my $SAMPLE_TESTS = File::Spec->catdir(
     File::Spec->curdir,
-    ( $ENV{PERL_CORE} ? 'lib' : 't' ),
-    'sample-tests'
+    ( $ENV{PERL_CORE} ? ( File::Spec->updir(), 'ext', 'Test', 'Harness' ) : () ),
+    't', 'sample-tests'
 );
 
 my %deprecated = map { $_ => 1 } qw(
diff --git a/t/lib/sample-tests/bailout b/ext/Test/Harness/t/sample-tests/bailout
similarity index 100%
rename from t/lib/sample-tests/bailout
rename to ext/Test/Harness/t/sample-tests/bailout
diff --git a/t/lib/sample-tests/bignum b/ext/Test/Harness/t/sample-tests/bignum
similarity index 100%
rename from t/lib/sample-tests/bignum
rename to ext/Test/Harness/t/sample-tests/bignum
diff --git a/t/lib/sample-tests/bignum_many b/ext/Test/Harness/t/sample-tests/bignum_many
similarity index 100%
rename from t/lib/sample-tests/bignum_many
rename to ext/Test/Harness/t/sample-tests/bignum_many
diff --git a/t/lib/sample-tests/combined b/ext/Test/Harness/t/sample-tests/combined
similarity index 100%
rename from t/lib/sample-tests/combined
rename to ext/Test/Harness/t/sample-tests/combined
diff --git a/t/lib/sample-tests/combined_compat b/ext/Test/Harness/t/sample-tests/combined_compat
similarity index 100%
rename from t/lib/sample-tests/combined_compat
rename to ext/Test/Harness/t/sample-tests/combined_compat
diff --git a/t/lib/sample-tests/delayed b/ext/Test/Harness/t/sample-tests/delayed
similarity index 100%
rename from t/lib/sample-tests/delayed
rename to ext/Test/Harness/t/sample-tests/delayed
diff --git a/t/lib/sample-tests/descriptive b/ext/Test/Harness/t/sample-tests/descriptive
similarity index 100%
rename from t/lib/sample-tests/descriptive
rename to ext/Test/Harness/t/sample-tests/descriptive
diff --git a/t/lib/sample-tests/descriptive_trailing b/ext/Test/Harness/t/sample-tests/descriptive_trailing
similarity index 100%
rename from t/lib/sample-tests/descriptive_trailing
rename to ext/Test/Harness/t/sample-tests/descriptive_trailing
diff --git a/t/lib/sample-tests/die b/ext/Test/Harness/t/sample-tests/die
similarity index 100%
rename from t/lib/sample-tests/die
rename to ext/Test/Harness/t/sample-tests/die
diff --git a/t/lib/sample-tests/die_head_end b/ext/Test/Harness/t/sample-tests/die_head_end
similarity index 100%
rename from t/lib/sample-tests/die_head_end
rename to ext/Test/Harness/t/sample-tests/die_head_end
diff --git a/t/lib/sample-tests/die_last_minute b/ext/Test/Harness/t/sample-tests/die_last_minute
similarity index 100%
rename from t/lib/sample-tests/die_last_minute
rename to ext/Test/Harness/t/sample-tests/die_last_minute
diff --git a/t/lib/sample-tests/die_unfinished b/ext/Test/Harness/t/sample-tests/die_unfinished
similarity index 100%
rename from t/lib/sample-tests/die_unfinished
rename to ext/Test/Harness/t/sample-tests/die_unfinished
diff --git a/t/lib/sample-tests/duplicates b/ext/Test/Harness/t/sample-tests/duplicates
similarity index 100%
rename from t/lib/sample-tests/duplicates
rename to ext/Test/Harness/t/sample-tests/duplicates
diff --git a/t/lib/sample-tests/echo b/ext/Test/Harness/t/sample-tests/echo
similarity index 100%
rename from t/lib/sample-tests/echo
rename to ext/Test/Harness/t/sample-tests/echo
diff --git a/t/lib/sample-tests/empty b/ext/Test/Harness/t/sample-tests/empty
similarity index 100%
rename from t/lib/sample-tests/empty
rename to ext/Test/Harness/t/sample-tests/empty
diff --git a/t/lib/sample-tests/escape_eol b/ext/Test/Harness/t/sample-tests/escape_eol
similarity index 100%
rename from t/lib/sample-tests/escape_eol
rename to ext/Test/Harness/t/sample-tests/escape_eol
diff --git a/t/lib/sample-tests/escape_hash b/ext/Test/Harness/t/sample-tests/escape_hash
similarity index 100%
rename from t/lib/sample-tests/escape_hash
rename to ext/Test/Harness/t/sample-tests/escape_hash
diff --git a/t/lib/sample-tests/head_end b/ext/Test/Harness/t/sample-tests/head_end
similarity index 100%
rename from t/lib/sample-tests/head_end
rename to ext/Test/Harness/t/sample-tests/head_end
diff --git a/t/lib/sample-tests/head_fail b/ext/Test/Harness/t/sample-tests/head_fail
similarity index 100%
rename from t/lib/sample-tests/head_fail
rename to ext/Test/Harness/t/sample-tests/head_fail
diff --git a/t/lib/sample-tests/inc_taint b/ext/Test/Harness/t/sample-tests/inc_taint
similarity index 100%
rename from t/lib/sample-tests/inc_taint
rename to ext/Test/Harness/t/sample-tests/inc_taint
diff --git a/t/lib/sample-tests/junk_before_plan b/ext/Test/Harness/t/sample-tests/junk_before_plan
similarity index 100%
rename from t/lib/sample-tests/junk_before_plan
rename to ext/Test/Harness/t/sample-tests/junk_before_plan
diff --git a/t/lib/sample-tests/lone_not_bug b/ext/Test/Harness/t/sample-tests/lone_not_bug
similarity index 100%
rename from t/lib/sample-tests/lone_not_bug
rename to ext/Test/Harness/t/sample-tests/lone_not_bug
diff --git a/t/lib/sample-tests/no_nums b/ext/Test/Harness/t/sample-tests/no_nums
similarity index 100%
rename from t/lib/sample-tests/no_nums
rename to ext/Test/Harness/t/sample-tests/no_nums
diff --git a/t/lib/sample-tests/no_output b/ext/Test/Harness/t/sample-tests/no_output
similarity index 100%
rename from t/lib/sample-tests/no_output
rename to ext/Test/Harness/t/sample-tests/no_output
diff --git a/t/lib/sample-tests/out_err_mix b/ext/Test/Harness/t/sample-tests/out_err_mix
similarity index 100%
rename from t/lib/sample-tests/out_err_mix
rename to ext/Test/Harness/t/sample-tests/out_err_mix
diff --git a/t/lib/sample-tests/out_of_order b/ext/Test/Harness/t/sample-tests/out_of_order
similarity index 100%
rename from t/lib/sample-tests/out_of_order
rename to ext/Test/Harness/t/sample-tests/out_of_order
diff --git a/t/lib/sample-tests/schwern b/ext/Test/Harness/t/sample-tests/schwern
similarity index 100%
rename from t/lib/sample-tests/schwern
rename to ext/Test/Harness/t/sample-tests/schwern
diff --git a/t/lib/sample-tests/schwern-todo-quiet b/ext/Test/Harness/t/sample-tests/schwern-todo-quiet
similarity index 100%
rename from t/lib/sample-tests/schwern-todo-quiet
rename to ext/Test/Harness/t/sample-tests/schwern-todo-quiet
diff --git a/t/lib/sample-tests/segfault b/ext/Test/Harness/t/sample-tests/segfault
similarity index 100%
rename from t/lib/sample-tests/segfault
rename to ext/Test/Harness/t/sample-tests/segfault
diff --git a/t/lib/sample-tests/sequence_misparse b/ext/Test/Harness/t/sample-tests/sequence_misparse
similarity index 100%
rename from t/lib/sample-tests/sequence_misparse
rename to ext/Test/Harness/t/sample-tests/sequence_misparse
diff --git a/t/lib/sample-tests/shbang_misparse b/ext/Test/Harness/t/sample-tests/shbang_misparse
similarity index 100%
rename from t/lib/sample-tests/shbang_misparse
rename to ext/Test/Harness/t/sample-tests/shbang_misparse
diff --git a/t/lib/sample-tests/simple b/ext/Test/Harness/t/sample-tests/simple
similarity index 100%
rename from t/lib/sample-tests/simple
rename to ext/Test/Harness/t/sample-tests/simple
diff --git a/t/lib/sample-tests/simple_fail b/ext/Test/Harness/t/sample-tests/simple_fail
similarity index 100%
rename from t/lib/sample-tests/simple_fail
rename to ext/Test/Harness/t/sample-tests/simple_fail
diff --git a/t/lib/sample-tests/simple_yaml b/ext/Test/Harness/t/sample-tests/simple_yaml
similarity index 100%
rename from t/lib/sample-tests/simple_yaml
rename to ext/Test/Harness/t/sample-tests/simple_yaml
diff --git a/t/lib/sample-tests/skip b/ext/Test/Harness/t/sample-tests/skip
similarity index 100%
rename from t/lib/sample-tests/skip
rename to ext/Test/Harness/t/sample-tests/skip
diff --git a/t/lib/sample-tests/skip_nomsg b/ext/Test/Harness/t/sample-tests/skip_nomsg
similarity index 100%
rename from t/lib/sample-tests/skip_nomsg
rename to ext/Test/Harness/t/sample-tests/skip_nomsg
diff --git a/t/lib/sample-tests/skipall b/ext/Test/Harness/t/sample-tests/skipall
similarity index 100%
rename from t/lib/sample-tests/skipall
rename to ext/Test/Harness/t/sample-tests/skipall
diff --git a/t/lib/sample-tests/skipall_nomsg b/ext/Test/Harness/t/sample-tests/skipall_nomsg
similarity index 100%
rename from t/lib/sample-tests/skipall_nomsg
rename to ext/Test/Harness/t/sample-tests/skipall_nomsg
diff --git a/t/lib/sample-tests/skipall_v13 b/ext/Test/Harness/t/sample-tests/skipall_v13
similarity index 100%
rename from t/lib/sample-tests/skipall_v13
rename to ext/Test/Harness/t/sample-tests/skipall_v13
diff --git a/t/lib/sample-tests/space_after_plan b/ext/Test/Harness/t/sample-tests/space_after_plan
similarity index 100%
rename from t/lib/sample-tests/space_after_plan
rename to ext/Test/Harness/t/sample-tests/space_after_plan
diff --git a/t/lib/sample-tests/stdout_stderr b/ext/Test/Harness/t/sample-tests/stdout_stderr
similarity index 100%
rename from t/lib/sample-tests/stdout_stderr
rename to ext/Test/Harness/t/sample-tests/stdout_stderr
diff --git a/t/lib/sample-tests/strict b/ext/Test/Harness/t/sample-tests/strict
similarity index 100%
rename from t/lib/sample-tests/strict
rename to ext/Test/Harness/t/sample-tests/strict
diff --git a/t/lib/sample-tests/switches b/ext/Test/Harness/t/sample-tests/switches
similarity index 100%
rename from t/lib/sample-tests/switches
rename to ext/Test/Harness/t/sample-tests/switches
diff --git a/t/lib/sample-tests/taint b/ext/Test/Harness/t/sample-tests/taint
similarity index 100%
rename from t/lib/sample-tests/taint
rename to ext/Test/Harness/t/sample-tests/taint
diff --git a/t/lib/sample-tests/taint_warn b/ext/Test/Harness/t/sample-tests/taint_warn
similarity index 100%
rename from t/lib/sample-tests/taint_warn
rename to ext/Test/Harness/t/sample-tests/taint_warn
diff --git a/t/lib/sample-tests/todo b/ext/Test/Harness/t/sample-tests/todo
similarity index 100%
rename from t/lib/sample-tests/todo
rename to ext/Test/Harness/t/sample-tests/todo
diff --git a/t/lib/sample-tests/todo_inline b/ext/Test/Harness/t/sample-tests/todo_inline
similarity index 100%
rename from t/lib/sample-tests/todo_inline
rename to ext/Test/Harness/t/sample-tests/todo_inline
diff --git a/t/lib/sample-tests/todo_misparse b/ext/Test/Harness/t/sample-tests/todo_misparse
similarity index 100%
rename from t/lib/sample-tests/todo_misparse
rename to ext/Test/Harness/t/sample-tests/todo_misparse
diff --git a/t/lib/sample-tests/too_many b/ext/Test/Harness/t/sample-tests/too_many
similarity index 100%
rename from t/lib/sample-tests/too_many
rename to ext/Test/Harness/t/sample-tests/too_many
diff --git a/t/lib/sample-tests/version_good b/ext/Test/Harness/t/sample-tests/version_good
similarity index 100%
rename from t/lib/sample-tests/version_good
rename to ext/Test/Harness/t/sample-tests/version_good
diff --git a/t/lib/sample-tests/version_late b/ext/Test/Harness/t/sample-tests/version_late
similarity index 100%
rename from t/lib/sample-tests/version_late
rename to ext/Test/Harness/t/sample-tests/version_late
diff --git a/t/lib/sample-tests/version_old b/ext/Test/Harness/t/sample-tests/version_old
similarity index 100%
rename from t/lib/sample-tests/version_old
rename to ext/Test/Harness/t/sample-tests/version_old
diff --git a/t/lib/sample-tests/vms_nit b/ext/Test/Harness/t/sample-tests/vms_nit
similarity index 100%
rename from t/lib/sample-tests/vms_nit
rename to ext/Test/Harness/t/sample-tests/vms_nit
diff --git a/t/lib/sample-tests/with_comments b/ext/Test/Harness/t/sample-tests/with_comments
similarity index 100%
rename from t/lib/sample-tests/with_comments
rename to ext/Test/Harness/t/sample-tests/with_comments
diff --git a/ext/Test/Harness/t/source.t b/ext/Test/Harness/t/source.t
index 8f7e60f..a6441a5 100644
--- a/ext/Test/Harness/t/source.t
+++ b/ext/Test/Harness/t/source.t
@@ -22,8 +22,8 @@ use TAP::Parser::Source::Perl;
 
 my $parser = EmptyParser->new;
 my $test   = File::Spec->catfile(
-    ( $ENV{PERL_CORE} ? 'lib' : 't' ), 'source_tests',
-    'source'
+    ( $ENV{PERL_CORE} ?  ( File::Spec->updir(), 'ext', 'Test', 'Harness' ) : () ),
+    't', 'source_tests', 'source'
 );
 
 my $perl = $^X;
diff --git a/t/lib/source_tests/harness b/ext/Test/Harness/t/source_tests/harness
similarity index 100%
rename from t/lib/source_tests/harness
rename to ext/Test/Harness/t/source_tests/harness
diff --git a/t/lib/source_tests/harness_badtap b/ext/Test/Harness/t/source_tests/harness_badtap
similarity index 100%
rename from t/lib/source_tests/harness_badtap
rename to ext/Test/Harness/t/source_tests/harness_badtap
diff --git a/t/lib/source_tests/harness_complain b/ext/Test/Harness/t/source_tests/harness_complain
similarity index 100%
rename from t/lib/source_tests/harness_complain
rename to ext/Test/Harness/t/source_tests/harness_complain
diff --git a/t/lib/source_tests/harness_directives b/ext/Test/Harness/t/source_tests/harness_directives
similarity index 100%
rename from t/lib/source_tests/harness_directives
rename to ext/Test/Harness/t/source_tests/harness_directives
diff --git a/t/lib/source_tests/harness_failure b/ext/Test/Harness/t/source_tests/harness_failure
similarity index 100%
rename from t/lib/source_tests/harness_failure
rename to ext/Test/Harness/t/source_tests/harness_failure
diff --git a/t/lib/source_tests/source b/ext/Test/Harness/t/source_tests/source
similarity index 100%
rename from t/lib/source_tests/source
rename to ext/Test/Harness/t/source_tests/source
diff --git a/t/lib/subclass_tests/non_perl_source b/ext/Test/Harness/t/subclass_tests/non_perl_source
similarity index 100%
rename from t/lib/subclass_tests/non_perl_source
rename to ext/Test/Harness/t/subclass_tests/non_perl_source
diff --git a/t/lib/subclass_tests/perl_source b/ext/Test/Harness/t/subclass_tests/perl_source
similarity index 100%
rename from t/lib/subclass_tests/perl_source
rename to ext/Test/Harness/t/subclass_tests/perl_source
diff --git a/ext/Test/Harness/t/testargs.t b/ext/Test/Harness/t/testargs.t
index 9160c59..0c69f8a 100644
--- a/ext/Test/Harness/t/testargs.t
+++ b/ext/Test/Harness/t/testargs.t
@@ -14,8 +14,8 @@ use TAP::Harness;
 use App::Prove;
 
 my $test = File::Spec->catfile(
-    ( $ENV{PERL_CORE} ? 'lib' : 't' ),
-    'sample-tests', 'echo'
+    ( $ENV{PERL_CORE} ? ( File::Spec->updir(), 'ext', 'Test', 'Harness' ) : () ),
+    't', 'sample-tests', 'echo'
 );
 
 diag( "\n\n", bigness( join ' ', @ARGV ), "\n\n" ) if @ARGV;