add Test::Utils::write_file

Author: mohawk2

t/basic.t

@@ -178,13 +178,9 @@ is( $?, 0,                                  '  exited normally' ) ||
     diag $test_out;
 
 # now simulate what Module::Install does, and edit $(PERL) to add flags
-open my $fh, '<', $makefile;
-my $mtext = join '', <$fh>;
-close $fh;
+my $mtext = slurp($makefile);
 $mtext =~ s/^(\s*PERL\s*=.*)$/$1 -Iinc/m;
-open $fh, '>', $makefile;
-print $fh $mtext;
-close $fh;
+write_file($makefile, $mtext);
 
 sub check_dummy_inst {
     my ($loc, $install_args, $label, $skipsubdir) = @_;
@@ -424,10 +420,10 @@ note "META file validity"; SKIP: {
 
 # Make sure init_dirscan doesn't go into the distdir
 # also with a "messup.PL" that will make a build fail
-open $fh, '>', 'messup.PL' or die "messup.PL: $!";
-print $fh 'print "Extracting messup (with variable substitutions)\n";' . "\n";
-print $fh 'die';
-close $fh;
+write_file('messup.PL', <<'TEXT');
+print "Extracting messup (with variable substitutions)\n";
+die;
+TEXT
 @mpl_out = run(qq{$perl Makefile.PL "PREFIX=$DUMMYINST"});
 
 cmp_ok( $?, '==', 0, 'Makefile.PL exited with zero' ) || diag(@mpl_out);
@@ -457,13 +453,10 @@ open(STDERR, ">&SAVERR") or die $!;
 close SAVERR;
 
 # test linkext=>{LINKTYPE=>''} still installs a pure-perl installation
-# warning, edits the Makefile.PL so either rewrite after this or do this last
 my $file = 'Makefile.PL';
-my $text = slurp $file;
+my $text = my $preserve_MPL = slurp $file;
 ok(($text =~ s#\);#    linkext=>{LINKTYPE=>''},\n$&#), 'successful M.PL edit');
-open $fh, '>', $file or die "$file: $!";
-print $fh $text;
-close $fh;
+write_file($file, $text);
 # now do with "Liar" subdir still there
 rmtree $DUMMYINST; # so no false positive from before
 @mpl_out = run(qq{$perl Makefile.PL "PREFIX=$DUMMYINST"});
@@ -474,6 +467,10 @@ rmtree 'Liar';
 rmtree $DUMMYINST; # so no false positive from before
 @mpl_out = run(qq{$perl Makefile.PL "PREFIX=$DUMMYINST"});
 check_dummy_inst($DUMMYINST, '', "with PREFIX=$DUMMYINST minus subdir", 1);
+write_file($file, $preserve_MPL); # restore Makefile.PL
+$realclean_out = run("$make realclean");
+rmtree 'Liar';
+rmtree $DUMMYINST;
 
 sub _normalize {
     my $hash = shift;

t/fixin.t

@@ -12,7 +12,7 @@ BEGIN {
 
 use File::Spec;
 
-use Test::More tests => 30;
+use Test::More tests => 25;
 
 use Config;
 use TieOut;
@@ -52,13 +52,11 @@ sub test_fixin {
     my($code, $test) = @_;
 
     my $file = "fixin_test";
-    ok(open(my $fh, ">", $file), "write $file") or diag "Can't write $file: $!";
-    print $fh $code;
-    close $fh;
+    write_file($file, $code);
 
     MY->fixin($file);
 
-    ok(open($fh, "<", $file), "read $file") or diag "Can't read $file: $!";
+    ok(open(my $fh, "<", $file), "read $file") or diag "Can't read $file: $!";
     my @lines = <$fh>;
     close $fh;
 
@@ -110,7 +108,7 @@ END
 
 # fixin shouldn't pick this up.
 SKIP: {
-    skip "Not relevant on VMS", 4 if $^O eq 'VMS';
+    skip "Not relevant on VMS", 3 if $^O eq 'VMS';
     test_fixin(<<END,
 #!/foo/bar/perly -w
 
@@ -129,8 +127,8 @@ END
 
 SKIP: {
     eval { chmod(0755, "usrbin/interp") }
-        or skip "no chmod", 8;
-    skip "Not relevant on VMS or MSWin32", 8 if $^O eq 'VMS' || $^O eq 'MSWin32' || $^O eq 'cygwin';
+        or skip "no chmod", 6;
+    skip "Not relevant on VMS or MSWin32", 6 if $^O eq 'VMS' || $^O eq 'MSWin32' || $^O eq 'cygwin';
 
     my $dir = getcwd();
     local $ENV{PATH} = join $Config{path_sep}, map "$dir/$_", qw(usrbin bin);

t/lib/MakeMaker/Test/Utils.pm

@@ -18,7 +18,7 @@ our $Is_FreeBSD = $^O eq 'freebsd';
 
 our @EXPORT = qw(which_perl perl_lib makefile_name makefile_backup
                  make make_run run make_macro calibrate_mtime
-                 have_compiler slurp
+                 have_compiler slurp write_file
                  $Is_VMS $Is_MacOS
                  run_ok
                  hash2files
@@ -395,6 +395,22 @@ sub slurp {
     return $text;
 }
 
+=item write_file
+
+  write_file('filename', @contents);
+
+Writes the content to the given file. Will die if errors occur.
+
+=cut
+
+sub write_file {
+  my ($file, @contents) = @_;
+  my $utf8 = ("$]" < 5.008 or !$Config{useperlio}) ? "" : ":utf8";
+  open my $fh, ">$utf8", $file or die "Can't create $file: $!";
+  print $fh @contents or die "Can't write to $file: $!";
+  close $fh or die "Can't close $file: $!";
+}
+
 =item hash2files
 
   hash2files('dirname', { 'filename' => 'some content' });
@@ -414,10 +430,7 @@ sub hash2files {
         $file = File::Spec->catfile(File::Spec->curdir, $prefix, split m{\/}, $file);
         my $dir = dirname($file);
         mkpath $dir;
-        my $utf8 = ("$]" < 5.008 or !$Config{useperlio}) ? "" : ":utf8";
-        open(FILE, ">$utf8", $file) || die "Can't create $file: $!";
-        print FILE $text;
-        close FILE;
+        write_file($file, $text);
         # ensure file at least 1 second old for makes that assume
         # files with the same time are out of date.
         my $time = calibrate_mtime();