Update to 1.001002
- New upstream release 1.001002 - Restore ability to use regex with test_err and test_out (CPAN RT#89655) - Drop upstreamed regex patch
This commit is contained in:
parent
752e31006b
commit
dd82ca2ceb
@ -1,45 +0,0 @@
|
||||
From 919f7398038fe24e7e23ffcff5c5abe1f00d13ce Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
|
||||
Date: Fri, 9 Aug 2013 09:16:10 +0200
|
||||
Subject: [PATCH] Pass regular expression intact
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
This commit:
|
||||
|
||||
commit 497965306444982d4948e24811e44e72619885f8
|
||||
Author: Michael G. Schwern <schwern@pobox.com>
|
||||
Date: Mon Apr 15 17:13:43 2013 +0100
|
||||
|
||||
Fix Test::Builder::Tester so it works with subtests.
|
||||
|
||||
broke test_err(qr//) because it converted the expression to a string.
|
||||
This patch omits regular expressions from indentation.
|
||||
|
||||
<https://github.com/schwern/test-more/issues/387>
|
||||
|
||||
Signed-off-by: Petr Písař <ppisar@redhat.com>
|
||||
---
|
||||
lib/Test/Builder/Tester.pm | 5 +++++
|
||||
1 file changed, 5 insertions(+)
|
||||
|
||||
diff --git a/lib/Test/Builder/Tester.pm b/lib/Test/Builder/Tester.pm
|
||||
index 299ee52..fed11b5 100644
|
||||
--- a/lib/Test/Builder/Tester.pm
|
||||
+++ b/lib/Test/Builder/Tester.pm
|
||||
@@ -479,6 +479,11 @@ sub expect {
|
||||
sub _account_for_subtest {
|
||||
my( $self, $check ) = @_;
|
||||
|
||||
+ if (ref $check) {
|
||||
+ # Do not mangle regular expression
|
||||
+ return $check;
|
||||
+ }
|
||||
+
|
||||
# Since we ship with Test::Builder, calling a private method is safe...ish.
|
||||
return $t->_indent . $check;
|
||||
}
|
||||
--
|
||||
1.8.1.4
|
||||
|
||||
@ -1,14 +1,11 @@
|
||||
%global cpan_version 0.99
|
||||
Name: perl-Test-Simple
|
||||
Summary: Basic utilities for writing tests
|
||||
Version: %(echo '%{cpan_version}' | tr _ .)
|
||||
Version: 1.001002
|
||||
Release: 1%{?dist}
|
||||
License: GPL+ or Artistic
|
||||
Group: Development/Libraries
|
||||
URL: http://search.cpan.org/dist/Test-Simple
|
||||
Source0: http://search.cpan.org/CPAN/authors/id/R/RJ/RJBS/Test-Simple-%{cpan_version}.tar.gz
|
||||
# https://github.com/schwern/test-more/issues/387
|
||||
Patch0: Test-Simple-0.98_05-Pass-regular-expression-intact.patch
|
||||
Source0: http://search.cpan.org/CPAN/authors/id/R/RJ/RJBS/Test-Simple-%{version}.tar.gz
|
||||
BuildArch: noarch
|
||||
BuildRequires: perl
|
||||
BuildRequires: perl(base)
|
||||
@ -51,8 +48,7 @@ information, see perldoc for Test::Simple, Test::More, etc.
|
||||
This package is the CPAN component of the dual-lifed core package Test-Simple.
|
||||
|
||||
%prep
|
||||
%setup -q -n Test-Simple-%{cpan_version}
|
||||
%patch0 -p1
|
||||
%setup -q -n Test-Simple-%{version}
|
||||
|
||||
%build
|
||||
perl Makefile.PL INSTALLDIRS=vendor
|
||||
@ -87,6 +83,11 @@ make test
|
||||
%{_mandir}/man3/Test::Tutorial.3pm*
|
||||
|
||||
%changelog
|
||||
* Tue Nov 5 2013 Paul Howarth <paul@city-fan.org> - 1.001002-1
|
||||
- Update to 1.001002
|
||||
- Restore ability to use regex with test_err and test_out (CPAN RT#89655)
|
||||
- Drop upstreamed regex patch
|
||||
|
||||
* Sat Oct 12 2013 Paul Howarth <paul@city-fan.org> - 0.99-1
|
||||
- 0.99 bump
|
||||
- This release by RJBS -> update source URL
|
||||
|
||||
Loading…
Reference in New Issue
Block a user