[Date Prev][Date Next][Thread Prev][Thread Next] [Search] [Date Index] [Thread Index]
[MacPerl-Porters] [PATCH 5.6.0] tests in :t:lib:{a-c}*.t

To: macperl-porters@macperl.org
Subject: [MacPerl-Porters] [PATCH 5.6.0] tests in :t:lib:{a-c}*.t
From: Prymmer/Kahn <pvhp@best.com>
Date: Tue, 16 May 2000 22:33:31 -0700 (PDT)

Hi,

Here is a patch to get through the a*.t,b*.t, and c*.t
tests in :t:lib:.  Please note that some of them require
attrs and/or Fcntl (extensions in :ext: that I do not have
since I am limited to a miniperl).  Also, I haven't had
time to apply Matthias' atof() patch so I am seeing many bigf*.t
failures that I guess I wouldn't if I incorporated that patch.
The cgi*.t test seem to want MacPerl::Volumes (???)

Rather than continuing a long winded report I'll just leave you
with the patch:

diff -ru :lib.orig:abbrev.t :lib:abbrev.t
--- :lib.orig:abbrev.t	Tue Jul 20 17:18:12 1999
+++ :lib:abbrev.t	Mon May 15 20:43:08 2000
@@ -4,7 +4,12 @@
 
 BEGIN {
     chdir 't' if -d 't';
-    unshift @INC, '../lib';
+	if ($^O eq 'MacOS') {
+        unshift @INC, '::lib:';
+	}
+	else {
+	    unshift @INC, '../lib';
+	}
 }
 
 use Text::Abbrev;
diff -ru :lib.orig:ansicolor.t :lib:ansicolor.t
--- :lib.orig:ansicolor.t	Sun Mar  5 17:29:33 2000
+++ :lib:ansicolor.t	Mon May 15 20:44:33 2000
@@ -2,7 +2,12 @@
 
 BEGIN {
     chdir 't' if -d 't';
-    unshift @INC, '../lib';
+	if ($^O eq 'MacOS') {
+        unshift @INC, '::lib:';
+	}
+	else {
+	    unshift @INC, '../lib';
+	}
 }
 
 # Test suite for the Term::ANSIColor Perl module.  Before `make install' is
diff -ru :lib.orig:anydbm.t :lib:anydbm.t
--- :lib.orig:anydbm.t	Fri Mar  3 02:34:21 2000
+++ :lib:anydbm.t	Tue May 16 19:35:49 2000
@@ -4,7 +4,12 @@
 
 BEGIN {
     chdir 't' if -d 't';
-    unshift @INC, '../lib';
+	if ($^O eq 'MacOS') {
+        unshift @INC, '::lib:';
+	}
+	else {
+	   unshift @INC, '../lib';
+	}
 }
 require AnyDBM_File;
 #If Fcntl is not available, try 0x202 or 0x102 for O_RDWR|O_CREAT
diff -ru :lib.orig:attrs.t :lib:attrs.t
--- :lib.orig:attrs.t	Tue Mar 14 22:43:10 2000
+++ :lib:attrs.t	Tue May 16 20:22:36 2000
@@ -4,7 +4,12 @@
 
 BEGIN {
     chdir 't' if -d 't';
-    unshift @INC, '../lib';
+	if ($^O eq 'MacOS') {
+        unshift @INC, '::lib:';
+	}
+	else {
+	    unshift @INC, '../lib';
+	}
     eval 'require attrs; 1' or do {
 	print "1..0\n";
 	exit 0;
diff -ru :lib.orig:autoloader.t :lib:autoloader.t
--- :lib.orig:autoloader.t	Tue Jul 20 17:18:12 1999
+++ :lib:autoloader.t	Tue May 16 20:51:49 2000
@@ -2,18 +2,27 @@
 
 BEGIN {
     chdir 't' if -d 't';
-    $dir = "auto-$$";
-    unshift @INC, ("./$dir", "../lib");
+
+	if ($^O eq 'MacOS') {
+	    $dir = ":auto-$$";
+        unshift @INC, ("$dir:", "::lib:");
+	}
+	else {
+	    $dir = "auto-$$";
+	    unshift @INC, ("./$dir", "../lib");
+	}
 }
 
 print "1..11\n";
 
+use File::Spec::Functions;
+
 # First we must set up some autoloader files
-mkdir $dir, 0755            or die "Can't mkdir $dir: $!";
-mkdir "$dir/auto", 0755     or die "Can't mkdir: $!";
-mkdir "$dir/auto/Foo", 0755 or die "Can't mkdir: $!";
+mkdir catdir($dir), 0755                or die "Can't mkdir $dir: $!";
+mkdir catdir("$dir","auto"), 0755       or die "Can't mkdir: $!";
+mkdir catdir("$dir","auto","Foo"), 0755 or die "Can't mkdir: $!";
 
-open(FOO, ">$dir/auto/Foo/foo.al") or die;
+open(FOO, ">".catfile($dir,"auto","Foo","foo.al")) or die;
 print FOO <<'EOT';
 package Foo;
 sub foo { shift; shift || "foo" }
@@ -21,7 +30,7 @@
 EOT
 close(FOO);
 
-open(BAR, ">$dir/auto/Foo/bar.al") or die;
+open(BAR, ">".catfile($dir,"auto","Foo","bar.al")) or die;
 print BAR <<'EOT';
 package Foo;
 sub bar { shift; shift || "bar" }
@@ -29,7 +38,7 @@
 EOT
 close(BAR);
 
-open(BAZ, ">$dir/auto/Foo/bazmarkhian.al") or die;
+open(BAZ, ">".catfile($dir,"auto","Foo","bazmarkhian.al")) or die;
 print BAZ <<'EOT';
 package Foo;
 sub bazmarkhianish { shift; shift || "baz" }
@@ -89,7 +98,7 @@
 print "ok 9\n";
 
 # test recursive autoloads
-open(F, ">$dir/auto/Foo/a.al") or die;
+open(F, ">".catfile($dir,"auto","Foo","a.al")) or die;
 print F <<'EOT';
 package Foo;
 BEGIN { b() }
@@ -98,7 +107,7 @@
 EOT
 close(F);
 
-open(F, ">$dir/auto/Foo/b.al") or die;
+open(F, ">".catfile($dir,"auto","Foo","b.al")) or die;
 print F <<'EOT';
 package Foo;
 sub b { print "ok 10\n"; }
@@ -110,12 +119,12 @@
 # cleanup
 END {
 return unless $dir && -d $dir;
-unlink "$dir/auto/Foo/foo.al";
-unlink "$dir/auto/Foo/bar.al";
-unlink "$dir/auto/Foo/bazmarkhian.al";
-unlink "$dir/auto/Foo/a.al";
-unlink "$dir/auto/Foo/b.al";
-rmdir "$dir/auto/Foo";
-rmdir "$dir/auto";
-rmdir "$dir";
+unlink catfile($dir,"auto","Foo","foo.al");
+unlink catfile($dir,"auto","Foo","bar.al");
+unlink catfile($dir,"auto","Foo","bazmarkhian.al");
+unlink catfile($dir,"auto","Foo","a.al");
+unlink catfile($dir,"auto","Foo","b.al");
+rmdir catdir($dir,"auto","Foo");
+rmdir catdir($dir,"auto");
+rmdir catdir($dir);
 }
diff -ru :lib.orig:basename.t :lib:basename.t
--- :lib.orig:basename.t	Tue Jul 20 17:18:12 1999
+++ :lib:basename.t	Tue May 16 20:55:26 2000
@@ -2,7 +2,12 @@
 
 BEGIN {
     chdir 't' if -d 't';
-    unshift @INC, '../lib';
+	if ($^O eq 'MacOS') {
+        unshift @INC, '::lib:';
+	}
+	else {
+	    unshift @INC, '../lib';
+	}
 }
 
 use File::Basename qw(fileparse basename dirname);
diff -ru :lib.orig:bigfloat.t :lib:bigfloat.t
--- :lib.orig:bigfloat.t	Tue Jul 20 17:18:12 1999
+++ :lib:bigfloat.t	Tue May 16 20:58:02 2000
@@ -1,6 +1,13 @@
 #!./perl
 
-BEGIN { @INC = '../lib' }
+BEGIN {
+    if ($^O eq 'MacOS') {
+        @INC = '::lib:';
+	}
+	else {
+        @INC = '../lib';
+	}
+}
 require "bigfloat.pl";
 
 $test = 0;
diff -ru :lib.orig:bigfltpm.t :lib:bigfltpm.t
--- :lib.orig:bigfltpm.t	Fri Mar  3 15:36:55 2000
+++ :lib:bigfltpm.t	Tue May 16 21:04:07 2000
@@ -2,7 +2,12 @@
 
 BEGIN {
     chdir 't' if -d 't';
-    @INC = '../lib';
+	if ($^O eq 'MacOS') {
+        @INC = '::lib:';
+	}
+	else {
+	    @INC = '../lib';
+	}
 }
 
 use Math::BigFloat;
diff -ru :lib.orig:bigint.t :lib:bigint.t
--- :lib.orig:bigint.t	Tue Jul 20 17:18:12 1999
+++ :lib:bigint.t	Tue May 16 21:06:03 2000
@@ -1,6 +1,13 @@
 #!./perl
 
-BEGIN { unshift @INC, '../lib' }
+BEGIN {
+    if ($^O eq 'MacOS') {
+	    unshift @INC, '::lib:';
+	}
+	else {
+		unshift @INC, '../lib';
+	}
+}
 require "bigint.pl";
 
 $test = 0;
diff -ru :lib.orig:bigintpm.t :lib:bigintpm.t
--- :lib.orig:bigintpm.t	Tue Jul 20 17:18:12 1999
+++ :lib:bigintpm.t	Tue May 16 21:07:14 2000
@@ -2,7 +2,12 @@
 
 BEGIN {
     chdir 't' if -d 't';
-    unshift @INC, '../lib';
+	if ($^O eq 'MacOS') {
+        unshift @INC, '::lib:';
+	}
+	else {
+	    unshift @INC, '../lib';
+	}
 }
 
 use Math::BigInt;
diff -ru :lib.orig:cgi-form.t :lib:cgi-form.t
--- :lib.orig:cgi-form.t	Tue Jul 20 17:18:12 1999
+++ :lib:cgi-form.t	Tue May 16 21:09:09 2000
@@ -5,7 +5,12 @@
 
 BEGIN {
     chdir 't' if -d 't';
-    unshift @INC, '../lib' if -d '../lib';
+	if ($^O eq 'MacOS') {
+        unshift @INC, '::lib:' if -d '::lib:';
+	}
+	else {
+	    unshift @INC, '../lib' if -d '../lib';
+	}
 }
 
 BEGIN {$| = 1; print "1..17\n"; }
diff -ru :lib.orig:cgi-function.t :lib:cgi-function.t
--- :lib.orig:cgi-function.t	Tue Jul 20 17:18:12 1999
+++ :lib:cgi-function.t	Tue May 16 21:11:35 2000
@@ -5,7 +5,12 @@
 
 BEGIN {
     chdir 't' if -d 't';
-    unshift @INC, '../lib' if -d '../lib';
+	if ($^O eq 'MacOS') {
+        unshift @INC, '::lib:' if -d '::lib:';
+	}
+	else {
+	    unshift @INC, '../lib' if -d '../lib';
+	}
 }
 
 BEGIN {$| = 1; print "1..24\n"; }
diff -ru :lib.orig:cgi-html.t :lib:cgi-html.t
--- :lib.orig:cgi-html.t	Mon Feb 28 06:58:50 2000
+++ :lib:cgi-html.t	Tue May 16 22:01:16 2000
@@ -5,7 +5,12 @@
 
 BEGIN {
     chdir 't' if -d 't';
-    unshift @INC, '../lib' if -d '../lib';
+	if ($^O eq 'MacOS') {
+        unshift @INC, '::lib:' if -d '::lib:';
+	}
+	else {
+	    unshift @INC, '../lib' if -d '../lib';
+	}
     require Config; import Config;
 }
 
diff -ru :lib.orig:cgi-request.t :lib:cgi-request.t
--- :lib.orig:cgi-request.t	Tue Jul 20 17:18:12 1999
+++ :lib:cgi-request.t	Tue May 16 22:02:50 2000
@@ -5,7 +5,12 @@
 
 BEGIN {
     chdir 't' if -d 't';
-    unshift @INC, '../lib' if -d '../lib';
+	if ($^O eq 'MacOS') {
+        unshift @INC, '::lib:' if -d '::lib:';
+	}
+	else {
+	    unshift @INC, '../lib' if -d '../lib';
+	}
 }
 
 BEGIN {$| = 1; print "1..31\n"; }
diff -ru :lib.orig:charnames.t :lib:charnames.t
--- :lib.orig:charnames.t	Mon Mar 20 20:36:02 2000
+++ :lib:charnames.t	Tue May 16 22:04:40 2000
@@ -3,7 +3,12 @@
 BEGIN {
     unless(grep /blib/, @INC) {
 	chdir 't' if -d 't';
-	unshift @INC, '../lib' if -d '../lib';
+	if ($^O eq 'MacOS') {
+	    unshift @INC, '::lib:' if -d '::lib:';
+	}
+	else {
+		unshift @INC, '../lib' if -d '../lib';
+	}
     }
 }
 
diff -ru :lib.orig:checktree.t :lib:checktree.t
--- :lib.orig:checktree.t	Tue Jul 20 17:18:12 1999
+++ :lib:checktree.t	Tue May 16 22:10:47 2000
@@ -2,7 +2,8 @@
 
 BEGIN {
     chdir 't' if -d 't';
-    unshift @INC, '../lib';
+	$dir = ($^O eq 'MacOS') ? '::lib:' : '../lib';
+    unshift @INC, $dir;
 }
 
 print "1..1\n";
@@ -11,9 +12,17 @@
 
 # We assume that we run from the perl "t" directory.
 
-validate q{
-    lib              -d || die
-    lib/checktree.t  -f || die
-};
+if ($^O eq 'MacOS') {
+    validate q{
+        :lib:              -d || die
+        :lib:checktree.t  -f || die
+    };
+}
+else {
+    validate q{
+        lib              -d || die
+        lib/checktree.t  -f || die
+    };
+}
 
 print "ok 1\n";
diff -ru :lib.orig:complex.t :lib:complex.t
--- :lib.orig:complex.t	Tue Mar 14 21:45:55 2000
+++ :lib:complex.t	Tue May 16 22:12:46 2000
@@ -9,7 +9,12 @@
 
 BEGIN {
     chdir 't' if -d 't';
-    unshift @INC, '../lib';
+	if ($^O eq 'MacOS') {
+        unshift @INC, '::lib:';
+	}
+	else {
+	    unshift @INC, '../lib';
+	}
 }
 
 use Math::Complex;
End of Patch.

Peter Prymmer






==== Want to unsubscribe from this list?
==== Send mail with body "unsubscribe" to macperl-porters-request@macperl.org
Prev by Date: [MacPerl-Porters] Re: CPAN Upload: LDS/CGI.pm-2.67.tar.gz
Next by Date: [MacPerl-Porters] [PATCH 5.6.0] tests in :t:lib:[d-f]*.t
Prev by thread: [MacPerl-Porters] [PATCH 5.6.0] tests in :t:lib:[d-f]*.t
Next by thread: [MacPerl-Porters] Re: CPAN Upload: LDS/CGI.pm-2.67.tar.gz
Navigation: Date Index | Thread Index | Search | Other lists at bumppo.net