From 20095f3196fb0da4a7fa64918467562a5c6c1154 Mon Sep 17 00:00:00 2001 From: Russ Allbery Date: Mon, 6 Jan 2014 21:09:55 -0800 Subject: Update Test::RRA modules from the current rra-c-util Further documentation of the changes will come later when the rest of rra-c-util files have been updated and the package makes more use of these modules, but this fixes a spelling error test failure. Change-Id: Ia885c4ab103235a1f6a2bf2b86d5a32c93751d89 Reviewed-on: https://gerrit.stanford.edu/1371 Reviewed-by: Russ Allbery Tested-by: Russ Allbery --- tests/tap/perl/Test/RRA.pm | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'tests/tap/perl/Test/RRA.pm') diff --git a/tests/tap/perl/Test/RRA.pm b/tests/tap/perl/Test/RRA.pm index 3035c7a..49c0d06 100644 --- a/tests/tap/perl/Test/RRA.pm +++ b/tests/tap/perl/Test/RRA.pm @@ -9,7 +9,7 @@ # The canonical version of this file is maintained in the rra-c-util package, # which can be found at . # -# Written by Russ Allbery +# Written by Russ Allbery # Copyright 2013 # The Board of Trustees of the Leland Stanford Junior University # @@ -56,7 +56,7 @@ BEGIN { # This version should match the corresponding rra-c-util release, but with # two digits for the minor version, including a leading zero if necessary, # so that it will sort properly. - $VERSION = '4.08'; + $VERSION = '5.00'; } # Skip this test unless maintainer tests are requested. Takes a short @@ -91,7 +91,7 @@ sub use_prereq { # If the first import looks like a version, pass it as a bare string. my $version = q{}; - if (@imports >= 1 && $imports[0] =~ m{ \A \d+ (?: [.]\d+ )* \z }xms) { + if (@imports >= 1 && $imports[0] =~ m{ \A \d+ (?: [.][\d_]+ )* \z }xms) { $version = shift(@imports); } @@ -118,7 +118,8 @@ sub use_prereq { # If the use failed for any reason, skip the test. if (!$result || $error) { - plan skip_all => "$module required for test"; + my $name = length($version) > 0 ? "$module $version" : $module; + plan skip_all => "$name required for test"; } # If the module set $SIG{__DIE__}, we cleared that via local. Restore it. @@ -148,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 @@ -187,7 +188,7 @@ value of an array. =head1 AUTHOR -Russ Allbery +Russ Allbery =head1 COPYRIGHT AND LICENSE -- cgit v1.2.3