diff --git a/Inline-C-0.80-test-Adjust-excpected-number-of-lines-in-log-to-Inli.patch b/Inline-C-0.80-test-Adjust-excpected-number-of-lines-in-log-to-Inli.patch new file mode 100644 index 0000000..4a01c41 --- /dev/null +++ b/Inline-C-0.80-test-Adjust-excpected-number-of-lines-in-log-to-Inli.patch @@ -0,0 +1,44 @@ +From 6f8b68c71fb57393cdd0b789dc68ae9c7d0c1d34 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= +Date: Tue, 30 Apr 2019 15:32:43 +0200 +Subject: [PATCH] test: Adjust excpected number of lines in log to + Inline-0.82_001 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +This Inline change: + + commit 13fd62a675c9de3c1fdb734898a689155647c5b1 (HEAD, origin/config-accum) + Author: Ed J + Date: Tue Apr 2 18:37:12 2019 +0100 + + merge per-language config, not overwrite + +available in Inline-0.82_001 changed log file content and Inline-C 09parser.t +test started to fail. This patch adjust the test to pass with old and new Inline. + +https://github.com/ingydotnet/inline-c-pm/issues/88 +Signed-off-by: Petr Písař +--- + t/09parser.t | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/t/09parser.t b/t/09parser.t +index 28b2148..0c94bf9 100644 +--- a/t/09parser.t ++++ b/t/09parser.t +@@ -177,7 +177,9 @@ is ($res, $prod, "Returned product"); + + chomp (my @p = do { local @ARGV = "$TestInlineSetup::DIR/parser_id"; <> }); + +-is (scalar @p, 21, "Match number of lines in log"); ++my $expected_log_lines = 13; ++$expected_log_lines += 8 if $Inline::VERSION < 0.82_001; ++is (scalar @p, $expected_log_lines, "Match number of lines in log"); + + TODO: { + local $TODO = 'Until pegex is default'; +-- +2.20.1 + diff --git a/perl-Inline-C.spec b/perl-Inline-C.spec index 770d6bd..1559cc7 100644 --- a/perl-Inline-C.spec +++ b/perl-Inline-C.spec @@ -1,10 +1,13 @@ Name: perl-Inline-C Version: 0.80 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Write Perl subroutines in C License: GPL+ or Artistic URL: https://metacpan.org/release/Inline-C Source0: https://cpan.metacpan.org/authors/id/T/TI/TINITA/Inline-C-%{version}.tar.gz +# Adjust a test to changes in Inline-C-0.82_001, proposed to upstream, +# +Patch0: Inline-C-0.80-test-Adjust-excpected-number-of-lines-in-log-to-Inli.patch BuildArch: noarch # Build BuildRequires: make @@ -75,6 +78,7 @@ each language has its own support module. %prep %setup -q -n Inline-C-%{version} +%patch0 -p1 %build perl Makefile.PL INSTALLDIRS=vendor NO_PACKLIST=1 NO_PERLLOCAL=1 OPTIMIZE="%{optflags}" @@ -98,6 +102,9 @@ make test %{_mandir}/man3/* %changelog +* Tue Apr 30 2019 Petr Pisar - 0.80-2 +- Adjust a test to changes in Inline-C-0.82_001 + * Thu Apr 18 2019 Petr Pisar - 0.80-1 - 0.80 bump