From: Craig A. Berry <craigberry@mac.com>
Date: Fri, 24 Mar 2006 21:05:45 +0000 (+0000)
Subject: restore EU::MM test fixes from 26079, 26813, and 26919
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=d04fb41ed39ab87f7ad32382b9884a42eceaca55;p=p5sagit%2Fp5-mst-13.2.git

restore EU::MM test fixes from 26079, 26813, and 26919
that were lost in 27590

p4raw-id: //depot/perl@27597
---

diff --git a/lib/ExtUtils/t/Command.t b/lib/ExtUtils/t/Command.t
index 92b61bf..22eabe5 100644
--- a/lib/ExtUtils/t/Command.t
+++ b/lib/ExtUtils/t/Command.t
@@ -58,7 +58,7 @@ BEGIN {
     ok( test_f(), 'testing non-existent file' );
 
     @ARGV = ( $Testfile );
-    cmp_ok( ! test_f(), '==', (-f $Testfile), 'testing non-existent file' );
+    cmp_ok( ! test_f(), '==', defined (-f $Testfile), 'testing non-existent file' );
 
     # these are destructive, have to keep setting @ARGV
     @ARGV = ( $Testfile );
diff --git a/lib/ExtUtils/t/FIRST_MAKEFILE.t b/lib/ExtUtils/t/FIRST_MAKEFILE.t
index 731dd34..00e6082 100644
--- a/lib/ExtUtils/t/FIRST_MAKEFILE.t
+++ b/lib/ExtUtils/t/FIRST_MAKEFILE.t
@@ -36,5 +36,5 @@ cmp_ok( $?, '==', 0, 'Makefile.PL exited with zero' ) || diag @mpl_out;
 
 ok( -e 'jakefile', 'FIRST_MAKEFILE honored' );
 
-ok( grep(/^Writing jakefile for Big::Dummy/, @mpl_out) == 1,
+ok( grep(/^Writing jakefile(?:\.)? for Big::Dummy/, @mpl_out) == 1,
 					'Makefile.PL output looks right' );
diff --git a/lib/ExtUtils/t/Manifest.t b/lib/ExtUtils/t/Manifest.t
index 396789e..47e555b 100644
--- a/lib/ExtUtils/t/Manifest.t
+++ b/lib/ExtUtils/t/Manifest.t
@@ -100,7 +100,7 @@ is( $res, 'bar', 'bar reported as new' );
 ($res, $warn) = do { local $ExtUtils::Manifest::Quiet = 1; 
                      catch_warning( \&skipcheck ) 
                 };
-cmp_ok( $warn, 'eq', '', 'disabled warnings' );
+ok( ! defined $warn, 'disabled warnings' );
 
 # add a skip file with a rule to skip itself (and the nonexistent glob '*baz*')
 add_file( 'MANIFEST.SKIP', "baz\n.SKIP" );
@@ -150,8 +150,16 @@ is_deeply( [sort map { lc } @copies], [sort map { lc } keys %$files] );
 foreach my $orig (@copies) {
     my $copy = "copy/$orig";
     ok( -r $copy,               "$copy: must be readable" );
-    is( -w $copy, -w $orig,     "       writable if original was" );
-    is( -x $copy, -x $orig,     "       executable if original was" );
+
+  SKIP: {
+    skip "       original was not writable", 1 unless -w $orig;
+    ok(-w $copy, "       writable if original was" );
+  }
+
+  SKIP: {
+    skip "       original was not executable", 1 unless -x $orig;
+    ok(-x $copy, "       executable if original was" );
+  }
 }
 rmtree('copy');
 
diff --git a/lib/ExtUtils/t/basic.t b/lib/ExtUtils/t/basic.t
index ba47687..8384d97 100644
--- a/lib/ExtUtils/t/basic.t
+++ b/lib/ExtUtils/t/basic.t
@@ -30,6 +30,9 @@ 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;