From: Russ Allbery <eagle@eyrie.org>
Date: Fri, 13 Dec 2013 01:34:28 +0000 (-0800)
Subject: Use Perl6::Slurp instead of File::Slurp
X-Git-Tag: release/2.2~10
X-Git-Url: https://git.eyrie.org/?a=commitdiff_plain;h=95b83a32ec9116056a02ad6257364b604109e520;p=kerberos%2Fkrb5-strength.git

Use Perl6::Slurp instead of File::Slurp

One utility was using Perl6::Slurp and another was using
File::Slurp.  Perl6::Slurp is nicer, so just use that, and
update the documentation.  Also document the bootstrap
requirements imposed by make-c-data.
---

diff --git a/README b/README
index bf591d1..cd13b8d 100644
--- a/README
+++ b/README
@@ -111,9 +111,9 @@ REQUIREMENTS
   following additional Perl modules will be used by the test suite if
   present:
 
-      File::Slurp
       IPC::Run
       JSON
+      Perl6::Slurp
       Test::MinimumVersion
       Test::Perl::Critic
       Test::Pod
@@ -131,7 +131,9 @@ REQUIREMENTS
   and need to regenerate Makefile.in, you will need Automake 1.11 or
   later.  For bootstrap or if you change configure.ac or any of the m4
   files it includes and need to regenerate configure or config.h.in, you
-  will need Autoconf 2.64 or later.
+  will need Autoconf 2.64 or later.  You will also need Perl 5.010 or
+  later and the JSON, Perl6::Slurp, and Readonly modules (from CPAN) to
+  bootstrap the test suite data from a Git checkout.
 
 COMPILING AND INSTALLING
 
diff --git a/tests/tap/perl/Test/RRA.pm b/tests/tap/perl/Test/RRA.pm
index eec262e..dc48ad8 100644
--- a/tests/tap/perl/Test/RRA.pm
+++ b/tests/tap/perl/Test/RRA.pm
@@ -149,7 +149,7 @@ Test::RRA - Support functions for Perl tests
     skip_unless_maintainer('Coding style tests');
 
     # Load modules, skipping the test if they're not available.
-    use_prereq('File::Slurp');
+    use_prereq('Perl6::Slurp', 'slurp');
     use_prereq('Test::Script::Run', '0.04');
 
 =head1 DESCRIPTION
diff --git a/tests/tools/heimdal-strength-t b/tests/tools/heimdal-strength-t
index eedb640..ec39a89 100755
--- a/tests/tools/heimdal-strength-t
+++ b/tests/tools/heimdal-strength-t
@@ -18,10 +18,10 @@ use File::Copy qw(copy);
 use Test::RRA qw(use_prereq);
 use Test::RRA::Automake qw(test_file_path);
 
-use_prereq('File::Slurp');
 use_prereq('IPC::Run', 'run');
 use_prereq('JSON');
-use_prereq('Test::More', '0.87_01');
+use_prereq('Perl6::Slurp', 'slurp');
+use_prereq('Test::More',   '0.87_01');
 
 # Run the newly-built heimdal-strength command and return the status, output,
 # and error output as a list.
@@ -139,7 +139,7 @@ sub load_password_tests {
     my $path = test_file_path("data/passwords/$file");
 
     # Load the test file data into memory.
-    my $testdata = read_file($path);
+    my $testdata = slurp($path);
 
     # Decode the JSON into Perl objects and return them.
     my $json = JSON->new->utf8;