Upgrade to ExtUtils-Manifest-1.49.

[p5sagit/p5-mst-13.2.git] / lib / ExtUtils / t / basic.t

diff --git a/lib/ExtUtils/t/basic.t b/lib/ExtUtils/t/basic.t
index cf6701c..ba5a7ba 100644 (file)
--- a/lib/ExtUtils/t/basic.t
+++ b/lib/ExtUtils/t/basic.t
@@ -25,11 +25,14 @@ use File::Path;
 
 # 'make disttest' sets a bunch of environment variables which interfere
 # with our testing.
-delete @ENV{qw(PREFIX LIB MAKEFLAGS MAKE_JOBS_FIFO)};
+delete @ENV{qw(PREFIX LIB MAKEFLAGS)};
 
 my $perl = which_perl();
 my $Is_VMS = $^O eq 'VMS';
 
+# GNV logical interferes with testing
+$ENV{'bin'} = '[.bin]' if $Is_VMS;
+
 chdir 't';
 
 perl_lib;
@@ -102,7 +105,9 @@ like( $ppd_html, qr{^\s*<DEPENDENCY NAME="strict" VERSION="0,0,0,0" />}m,
                                                            '  <DEPENDENCY>' );
 like( $ppd_html, qr{^\s*<OS NAME="$Config{osname}" />}m,
                                                            '  <OS>'      );
-like( $ppd_html, qr{^\s*<ARCHITECTURE NAME="$Config{archname}" />}m,  
+my $archname = $Config{archname};
+$archname .= "-". substr($Config{version},0,3) if $] >= 5.008;
+like( $ppd_html, qr{^\s*<ARCHITECTURE NAME="$archname" />}m,
                                                            '  <ARCHITECTURE>');
 like( $ppd_html, qr{^\s*<CODEBASE HREF="" />}m,            '  <CODEBASE>');
 like( $ppd_html, qr{^\s*</IMPLEMENTATION>}m,           '  </IMPLEMENTATION>');