Change 11953 by jhi@alpha on 2001/09/09 00:32:05
Subject: [REPATCH] Re: [PATCH] new test lib/blib.t
From: Michael G Schwern <[EMAIL PROTECTED]>
Date: Sat, 8 Sep 2001 19:45:46 -0400
Message-ID: <20010908194546.C9193@blackrider>
Affected files ...
... //depot/perl/MANIFEST#548 edit
... //depot/perl/lib/blib.pm#10 edit
... //depot/perl/lib/blib.t#1 add
... //depot/perl/t/lib/1_compile.t#39 edit
Differences ...
==== //depot/perl/MANIFEST#548 (text) ====
Index: perl/MANIFEST
--- perl/MANIFEST.~1~ Sat Sep 8 18:45:06 2001
+++ perl/MANIFEST Sat Sep 8 18:45:06 2001
@@ -763,6 +763,7 @@
lib/bigint.t See if bigint.pl works
lib/bigrat.pl An arbitrary precision rational arithmetic package
lib/blib.pm For "use blib"
+lib/blib.t blib.pm test
lib/bytes.pm Pragma to enable byte operations
lib/bytes_heavy.pl Support routines for byte pragma
lib/cacheout.pl Manages output filehandles when you need too
many
==== //depot/perl/lib/blib.pm#10 (text) ====
Index: perl/lib/blib.pm
--- perl/lib/blib.pm.~1~ Sat Sep 8 18:45:06 2001
+++ perl/lib/blib.pm Sat Sep 8 18:45:06 2001
@@ -38,8 +38,9 @@
use Cwd;
-use vars qw($VERSION);
+use vars qw($VERSION $Verbose);
$VERSION = '1.00';
+$Verbose = 0;
sub import
{
@@ -61,7 +62,7 @@
if (-d $blib && -d "$blib/arch" && -d "$blib/lib")
{
unshift(@INC,"$blib/arch","$blib/lib");
- warn "Using $blib\n";
+ warn "Using $blib\n" if $Verbose;
return;
}
$dir .= "/..";
==== //depot/perl/t/lib/1_compile.t#39 (text) ====
Index: perl/t/lib/1_compile.t
--- perl/t/lib/1_compile.t.~1~ Sat Sep 8 18:45:06 2001
+++ perl/t/lib/1_compile.t Sat Sep 8 18:45:06 2001
@@ -194,6 +194,7 @@
UNIVERSAL
attributes
base
+blib
bytes
ops
warnings::register
==== //depot/perl/lib/blib.t#1 (text) ====
Index: perl/lib/blib.t
--- perl/lib/blib.t.~1~ Sat Sep 8 18:45:06 2001
+++ perl/lib/blib.t Sat Sep 8 18:45:06 2001
@@ -0,0 +1,45 @@
+#!./perl -Tw
+
+BEGIN {
+ chdir 't' if -d 't';
+ @INC = '../lib';
+}
+
+use strict;
+
+sub _cleanup {
+ rmdir foreach reverse qw(blib blib/arch blib/lib);
+ unlink "stderr";
+}
+
+sub _mkdirs {
+ for my $dir (@_) {
+ next if -d $dir;
+ mkdir $dir or die "Can't mkdir $dir: $!" if ! -d $dir;
+ }
+}
+
+
+BEGIN { _cleanup }
+
+use Test::More tests => 7;
+
+eval 'use blib;';
+ok( $@ =~ /Cannot find blib/, 'Fails if blib directory not found' );
+
+_mkdirs(qw(blib blib/arch blib/lib));
+
+{
+ my $warnings;
+ local $SIG{__WARN__} = sub { $warnings = join '', @_ };
+ use_ok('blib');
+ is( $warnings, '', 'use blib is niiiice and quiet' );
+}
+
+is( @INC, 3, '@INC now has 3 elements' );
+is( $INC[2], '../lib', 'blib added to the front of @INC' );
+
+ok( grep(m|blib/lib$|, @INC[0,1]) == 1, ' blib/lib in @INC');
+ok( grep(m|blib/arch$|, @INC[0,1]) == 1, ' blib/arch in @INC');
+
+END { _cleanup(); }
End of Patch.
