Rewhack Test-Simple into core harness.

p4raw-id: //depot/perl@11912

diff --git a/lib/Test/Simple/t/exit.t b/lib/Test/Simple/t/exit.t
index 27bf1fb..86954ab 100644 (file)
--- a/lib/Test/Simple/t/exit.t
+++ b/lib/Test/Simple/t/exit.t
@@ -1,3 +1,9 @@
+BEGIN {
+    chdir 't' if -d 't';
+    @INC = '../lib';
+    use File::Spec;
+}
+
 # Can't use Test.pm, that's a 5.005 thing.
 package My::Test;
 
@@ -37,10 +43,14 @@ my %Tests = (
 
 print "1..".keys(%Tests)."\n";
 
+my $lib = File::Spec->catdir('lib', 'Test', 'Simple', 'sample_tests');
+
 while( my($test_name, $exit_codes) = each %Tests ) {
     my($exit_code) = $exit_codes->[$IsVMS ? 1 : 0];
 
-    my $wait_stat = system(qq{$^X t/lib/Test/Simple/sample_tests/$test_name});
+    my $file = File::Spec->catfile($lib, $test_name);
+
+    my $wait_stat = system(qq{$^X -"I../lib" -"I../t/lib" $file});
     my $actual_exit = $wait_stat >> 8;
 
     My::Test::ok( $actual_exit == $exit_code, 

diff --git a/lib/Test/Simple/t/extra.t b/lib/Test/Simple/t/extra.t
index 0df2c40..9d54894 100644 (file)
--- a/lib/Test/Simple/t/extra.t
+++ b/lib/Test/Simple/t/extra.t
@@ -1,3 +1,8 @@
+BEGIN {
+    chdir 't' if -d 't';
+    @INC = '../lib';
+}
+
 # Can't use Test.pm, that's a 5.005 thing.
 package My::Test;
 
@@ -21,7 +26,7 @@ package main;
 
 require Test::Simple;
 
-push @INC, 't/lib/';
+push @INC, '../t/lib';
 require Test::Simple::Catch;
 my($out, $err) = Test::Simple::Catch::caught();
 
@@ -43,11 +48,7 @@ ok 4 - Car
 not ok 5 - Sar
 OUT
 
-    My::Test::ok($$err eq <<ERR);
-#     Failed test ($0 at line 31)
-#     Failed test ($0 at line 34)
-# Looks like you planned 3 tests but ran 2 extra.
-ERR
+    My::Test::ok($$err =~ /Looks like you planned 3 tests but ran 2 extra/);
 
     exit 0;
 }

diff --git a/lib/Test/Simple/t/fail-like.t b/lib/Test/Simple/t/fail-like.t
index dee34e6..40a70e6 100644 (file)
--- a/lib/Test/Simple/t/fail-like.t
+++ b/lib/Test/Simple/t/fail-like.t
@@ -13,6 +13,11 @@ BEGIN {
 
 use strict;
 
+BEGIN { 
+    chdir 't' if -d 't';
+    @INC = '../lib';
+}
+
 # Can't use Test.pm, that's a 5.005 thing.
 package My::Test;
 
@@ -36,7 +41,7 @@ package main;
 
 require Test::More;
 
-push @INC, 't/lib';
+push @INC, '../t/lib';
 require Test::Simple::Catch::More;
 my($out, $err) = Test::Simple::Catch::More::caught();
 

diff --git a/lib/Test/Simple/t/fail-more.t b/lib/Test/Simple/t/fail-more.t
index 34abfae..6a85e2c 100644 (file)
--- a/lib/Test/Simple/t/fail-more.t
+++ b/lib/Test/Simple/t/fail-more.t
@@ -1,5 +1,10 @@
 use strict;
 
+BEGIN {
+    chdir 't' if -d 't';
+    @INC = '../lib';
+}
+
 # Can't use Test.pm, that's a 5.005 thing.
 package My::Test;
 
@@ -25,7 +30,7 @@ package main;
 
 require Test::More;
 
-push @INC, 't/lib';
+push @INC, '../t/lib';
 require Test::Simple::Catch::More;
 my($out, $err) = Test::Simple::Catch::More::caught();
 

diff --git a/lib/Test/Simple/t/fail.t b/lib/Test/Simple/t/fail.t
index 5e77066..9220271 100644 (file)
--- a/lib/Test/Simple/t/fail.t
+++ b/lib/Test/Simple/t/fail.t
@@ -1,5 +1,10 @@
 use strict;
 
+BEGIN {
+    chdir 't' if -d 't';
+    @INC = '../lib';
+}
+
 # Can't use Test.pm, that's a 5.005 thing.
 package My::Test;
 
@@ -23,7 +28,7 @@ package main;
 
 require Test::Simple;
 
-push @INC, 't/lib';
+push @INC, '../t/lib';
 require Test::Simple::Catch;
 my($out, $err) = Test::Simple::Catch::caught();
 
@@ -46,11 +51,7 @@ not ok 4 - oh no!
 not ok 5 - damnit
 OUT
 
-    My::Test::ok($$err eq <<ERR);
-#     Failed test ($0 at line 35)
-#     Failed test ($0 at line 36)
-# Looks like you failed 2 tests of 5.
-ERR
+    My::Test::ok($$err =~ /Looks like you failed 2 tests of 5/;
 
     # Prevent Test::Simple from exiting with non zero
     exit 0;

diff --git a/lib/Test/Simple/t/missing.t b/lib/Test/Simple/t/missing.t
index fd80c75..7e64d23 100644 (file)
--- a/lib/Test/Simple/t/missing.t
+++ b/lib/Test/Simple/t/missing.t
@@ -1,4 +1,10 @@
 # Can't use Test.pm, that's a 5.005 thing.
+
+BEGIN {
+    chdir 't' if -d 't';
+    @INC = '../lib';
+}
+
 package My::Test;
 
 print "1..2\n";
@@ -21,7 +27,7 @@ package main;
 
 require Test::Simple;
 
-push @INC, 't/lib';
+push @INC, '../t/lib';
 require Test::Simple::Catch;
 my($out, $err) = Test::Simple::Catch::caught();
 
@@ -37,10 +43,7 @@ ok 1 - Foo
 not ok 2 - Bar
 OUT
 
-    My::Test::ok($$err eq <<ERR);
-#     Failed test ($0 at line 31)
-# Looks like you planned 5 tests but only ran 2.
-ERR
+    My::Test::ok($$err =~ /Looks like you planned 5 tests but only ran 2/);
 
     exit 0;
 }

diff --git a/lib/Test/Simple/t/no_plan.t b/lib/Test/Simple/t/no_plan.t
index f2cc8a8..94d75cb 100644 (file)
--- a/lib/Test/Simple/t/no_plan.t
+++ b/lib/Test/Simple/t/no_plan.t
@@ -1,4 +1,10 @@
 # Can't use Test.pm, that's a 5.005 thing.
+
+BEGIN {
+    chdir 't' if -d 't';
+    @INC = '../lib';
+}
+
 package My::Test;
 
 print "1..12\n";
@@ -21,7 +27,7 @@ package main;
 
 require Test::Simple;
 
-push @INC, 't/lib';
+push @INC, '../t/lib';
 require Test::Simple::Catch;
 my($out, $err) = Test::Simple::Catch::caught();
 

diff --git a/lib/Test/Simple/t/plan_is_noplan.t b/lib/Test/Simple/t/plan_is_noplan.t
index 9aeb61d..dd0833c 100644 (file)
--- a/lib/Test/Simple/t/plan_is_noplan.t
+++ b/lib/Test/Simple/t/plan_is_noplan.t
@@ -30,7 +30,7 @@ package main;
 
 require Test::Simple;
 
-push @INC, 't/lib';
+push @INC, '../t/lib';
 require Test::Simple::Catch::More;
 my($out, $err) = Test::Simple::Catch::More::caught();
 

diff --git a/lib/Test/Simple/t/skipall.t b/lib/Test/Simple/t/skipall.t
index 43ea12a..061bfc7 100644 (file)
--- a/lib/Test/Simple/t/skipall.t
+++ b/lib/Test/Simple/t/skipall.t
@@ -1,5 +1,10 @@
 use strict;
 
+BEGIN {
+    chdir 't' if -d 't';
+    @INC = '../lib';
+}
+
 # Can't use Test.pm, that's a 5.005 thing.
 package My::Test;
 
@@ -22,7 +27,7 @@ sub ok ($;$) {
 package main;
 require Test::More;
 
-push @INC, 't/lib';
+push @INC, '../t/lib';
 require Test::Simple::Catch::More;
 my($out, $err) = Test::Simple::Catch::More::caught();