Upgrade to CPAN 1.64, from Andreas Koenig.

p4raw-id: //depot/perl@18672

4 files changed, 5 insertions, 15 deletions

diff --git a/lib/CPAN/t/Nox.t b/lib/CPAN/t/Nox.t
index 3d5565b157..4006771081 100644
--- a/lib/CPAN/t/Nox.t
+++ b/lib/CPAN/t/Nox.t
@@ -1,14 +1,13 @@
 #!./perl
 
-BEGIN {
-	chdir 't' if -d 't';
-	@INC = '../lib';
-}
-
+use lib "BUNDLE";
 use Test::More tests => 8;
 
 # use this first to $CPAN::term can be undefined
 use_ok( 'CPAN' );
+$CPAN::Suppress_readline = $CPAN::Suppress_readline; # silence
+$CPAN::META = $CPAN::META; # silence
+$CPAN::term = $CPAN::term; # silence
 undef $CPAN::term;
 
 # this kicks off all the magic
diff --git a/lib/CPAN/t/loadme.t b/lib/CPAN/t/loadme.t
index dce7e1081d..fd0b67989d 100644
--- a/lib/CPAN/t/loadme.t
+++ b/lib/CPAN/t/loadme.t
@@ -1,11 +1,6 @@
 #!/usr/bin/perl -w
 
 BEGIN {
-	chdir 't' if -d 't';
-	@INC = '../lib';
-}
-
-BEGIN {
     print "1..1\n";
 }
 use strict;
diff --git a/lib/CPAN/t/mirroredby.t b/lib/CPAN/t/mirroredby.t
index 91bd396200..f383be82bc 100644
--- a/lib/CPAN/t/mirroredby.t
+++ b/lib/CPAN/t/mirroredby.t
@@ -8,6 +8,7 @@ BEGIN {
 }
 
 use strict;
+use lib "BUNDLE";
 use Test::More tests => 6; 
 
 use_ok( 'CPAN::FirstTime' );
diff --git a/lib/CPAN/t/vcmp.t b/lib/CPAN/t/vcmp.t
index 290fc3d206..daed979570 100644
--- a/lib/CPAN/t/vcmp.t
+++ b/lib/CPAN/t/vcmp.t
@@ -1,10 +1,5 @@
 # -*- Mode: cperl; coding: utf-8; -*-
 
-BEGIN {
-	chdir 't' if -d 't';
-	@INC = '../lib';
-}
-
 use strict;
 use CPAN;
 use vars qw($D $N);