Change 10994 by jhi@alpha on 2001/06/27 19:55:16
The Test::More and Test::Simple tests required help
thanks to our schizophrenic test scheme.
Affected files ...
... //depot/perl/lib/Test/More/t/fail-like.t#3 edit
... //depot/perl/lib/Test/More/t/fail.t#3 edit
... //depot/perl/lib/Test/More/t/plan_is_noplan.t#3 edit
... //depot/perl/lib/Test/More/t/skipall.t#3 edit
... //depot/perl/lib/Test/Simple/t/exit.t#3 edit
... //depot/perl/lib/Test/Simple/t/extra.t#3 edit
... //depot/perl/lib/Test/Simple/t/fail.t#3 edit
... //depot/perl/lib/Test/Simple/t/missing.t#3 edit
... //depot/perl/lib/Test/Simple/t/no_plan.t#3 edit
... //depot/perl/lib/Test/Simple/t/plan_is_noplan.t#3 edit
Differences ...
==== //depot/perl/lib/Test/More/t/fail-like.t#3 (text) ====
Index: perl/lib/Test/More/t/fail-like.t
--- perl/lib/Test/More/t/fail-like.t.~1~ Wed Jun 27 16:00:12 2001
+++ perl/lib/Test/More/t/fail-like.t Wed Jun 27 16:00:12 2001
@@ -35,7 +35,7 @@
package main;
require Test::More;
-push @INC, 't', '.';
+@INC = ('../lib', 'lib/Test/More');
require Catch;
my($out, $err) = Catch::caught();
==== //depot/perl/lib/Test/More/t/fail.t#3 (text) ====
Index: perl/lib/Test/More/t/fail.t
--- perl/lib/Test/More/t/fail.t.~1~ Wed Jun 27 16:00:12 2001
+++ perl/lib/Test/More/t/fail.t Wed Jun 27 16:00:12 2001
@@ -22,7 +22,7 @@
package main;
require Test::More;
-push @INC, 't', '.';
+@INC = ('../lib', 'lib/Test/More');
require Catch;
my($out, $err) = Catch::caught();
==== //depot/perl/lib/Test/More/t/plan_is_noplan.t#3 (text) ====
Index: perl/lib/Test/More/t/plan_is_noplan.t
--- perl/lib/Test/More/t/plan_is_noplan.t.~1~ Wed Jun 27 16:00:12 2001
+++ perl/lib/Test/More/t/plan_is_noplan.t Wed Jun 27 16:00:12 2001
@@ -21,7 +21,7 @@
require Test::More;
-push @INC, 't', '.';
+@INC = ('../lib', 'lib/Test/More');
require Catch;
my($out, $err) = Catch::caught();
==== //depot/perl/lib/Test/More/t/skipall.t#3 (text) ====
Index: perl/lib/Test/More/t/skipall.t
--- perl/lib/Test/More/t/skipall.t.~1~ Wed Jun 27 16:00:12 2001
+++ perl/lib/Test/More/t/skipall.t Wed Jun 27 16:00:12 2001
@@ -22,7 +22,7 @@
package main;
require Test::More;
-push @INC, 't', '.';
+@INC = ('../lib', 'lib/Test/More');
require Catch;
my($out, $err) = Catch::caught();
==== //depot/perl/lib/Test/Simple/t/exit.t#3 (text) ====
Index: perl/lib/Test/Simple/t/exit.t
--- perl/lib/Test/Simple/t/exit.t.~1~ Wed Jun 27 16:00:12 2001
+++ perl/lib/Test/Simple/t/exit.t Wed Jun 27 16:00:12 2001
@@ -33,8 +33,13 @@
print "1..".keys(%Tests)."\n";
chdir 't' if -d 't';
+use File::Spec;
+my $lib = File::Spec->catdir('lib', 'Test', 'Simple', 'sample_tests');
while( my($test_name, $exit_code) = each %Tests ) {
- my $wait_stat = system(qq{$^X -"I../blib/lib" sample_tests/$test_name});
+ my $file = File::Spec->catfile($lib, $test_name);
+ my $wait_stat = system(qq{$^X -"I../lib" -"Ilib/Test/Simple" $file});
My::Test::ok( $wait_stat >> 8 == $exit_code,
"$test_name exited with $exit_code" );
}
+
+
==== //depot/perl/lib/Test/Simple/t/extra.t#3 (text) ====
Index: perl/lib/Test/Simple/t/extra.t
--- perl/lib/Test/Simple/t/extra.t.~1~ Wed Jun 27 16:00:12 2001
+++ perl/lib/Test/Simple/t/extra.t Wed Jun 27 16:00:12 2001
@@ -21,7 +21,7 @@
require Test::Simple;
-push @INC, 't', '.';
+@INC = ('../lib', 'lib/Test/Simple');
require Catch;
my($out, $err) = Catch::caught();
==== //depot/perl/lib/Test/Simple/t/fail.t#3 (text) ====
Index: perl/lib/Test/Simple/t/fail.t
--- perl/lib/Test/Simple/t/fail.t.~1~ Wed Jun 27 16:00:12 2001
+++ perl/lib/Test/Simple/t/fail.t Wed Jun 27 16:00:12 2001
@@ -23,7 +23,7 @@
require Test::Simple;
-push @INC, 't', '.';
+@INC = ('../lib', 'lib/Test/Simple');
require Catch;
my($out, $err) = Catch::caught();
==== //depot/perl/lib/Test/Simple/t/missing.t#3 (text) ====
Index: perl/lib/Test/Simple/t/missing.t
--- perl/lib/Test/Simple/t/missing.t.~1~ Wed Jun 27 16:00:12 2001
+++ perl/lib/Test/Simple/t/missing.t Wed Jun 27 16:00:12 2001
@@ -21,7 +21,7 @@
require Test::Simple;
-push @INC, 't', '.';
+@INC = ('../lib', 'lib/Test/Simple');
require Catch;
my($out, $err) = Catch::caught();
==== //depot/perl/lib/Test/Simple/t/no_plan.t#3 (text) ====
Index: perl/lib/Test/Simple/t/no_plan.t
--- perl/lib/Test/Simple/t/no_plan.t.~1~ Wed Jun 27 16:00:12 2001
+++ perl/lib/Test/Simple/t/no_plan.t Wed Jun 27 16:00:12 2001
@@ -21,7 +21,7 @@
require Test::Simple;
-push @INC, 't', '.';
+@INC = ('../lib', 'lib/Test/Simple');
require Catch;
my($out, $err) = Catch::caught();
==== //depot/perl/lib/Test/Simple/t/plan_is_noplan.t#3 (text) ====
Index: perl/lib/Test/Simple/t/plan_is_noplan.t
--- perl/lib/Test/Simple/t/plan_is_noplan.t.~1~ Wed Jun 27 16:00:12 2001
+++ perl/lib/Test/Simple/t/plan_is_noplan.t Wed Jun 27 16:00:12 2001
@@ -30,7 +30,7 @@
require Test::Simple;
-push @INC, 't', '.';
+@INC = ('../lib', 'lib/Test/Simple');
require Catch;
my($out, $err) = Catch::caught();
End of Patch.
