diff options
| author | Russ Allbery <rra@cpan.org> | 2023-11-18 16:15:27 -0800 |
|---|---|---|
| committer | Russ Allbery <rra@cpan.org> | 2023-11-18 16:15:27 -0800 |
| commit | 1cfa07436f49688c46b4ba67b127319a12ee0106 (patch) | |
| tree | 21cd986fb142ff5e5272ddae6a3530450869c672 | |
| parent | 72f0e7d1a83a4eb1990cd18a13e3c4740fbb8bc6 (diff) | |
Commit patch queue (exported by git-debrebase)
[git-debrebase make-patches: export and commit patches]
| -rw-r--r-- | debian/patches/0001-Fix-t-spin-errors-with-Perl-5.36.patch | 35 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
2 files changed, 36 insertions, 0 deletions
diff --git a/debian/patches/0001-Fix-t-spin-errors-with-Perl-5.36.patch b/debian/patches/0001-Fix-t-spin-errors-with-Perl-5.36.patch new file mode 100644 index 0000000..d14a528 --- /dev/null +++ b/debian/patches/0001-Fix-t-spin-errors-with-Perl-5.36.patch @@ -0,0 +1,35 @@ +From: Russ Allbery <rra@cpan.org> +Date: Sat, 11 Jun 2022 16:33:06 -0700 +Subject: Fix t/spin/errors with Perl 5.36 + +The Text::Balanced in Perl 5.36 uses a different default regex for +extracting text, which changes the error output. Adjust for that +in the test suite. +--- + t/spin/errors.t | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/t/spin/errors.t b/t/spin/errors.t +index c35669b..235240e 100755 +--- a/t/spin/errors.t ++++ b/t/spin/errors.t +@@ -19,7 +19,7 @@ use Test::More tests => 2; + # not entirely correct because line tracking is very complicated and still not + # entirely correct. + my $EXPECTED_ERRORS = <<'ERRORS'; +-errors.th:1: cannot find argument 2: Did not find opening bracket after prefix: "\s*", detected at offset 2 ++errors.th:1: cannot find argument 2: Did not find opening bracket after prefix: <PREFIX>, detected at offset 2 + errors.th:3: invalid macro placeholder \2 (greater than 1) + errors.th:5: invalid macro argument count for \badcount + errors.th:9: unknown variable \=UNKNOWN +@@ -40,7 +40,9 @@ my ($stdout, $stderr) = capture { + $spin->spin_thread_file($input); + }; + +-# Simplify the file name, and then check against the expected output. ++# Simplify the file name and search prefix, and then check against the ++# expected output. + $stderr =~ s{ ^ [^:]+/errors[.]th: }{errors.th:}xmsg; + $stderr =~ s{ (cannot [ ] stat [ ] file [ ]) /[^:]+/([^/:]+) : .* }{$1$2\n}xms; ++$stderr =~ s{ (prefix: [ ]) \"[^\"]+\", }{$1<PREFIX>,}xms; + is($stderr, $EXPECTED_ERRORS, 'errors are correct'); diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..d4b4906 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +0001-Fix-t-spin-errors-with-Perl-5.36.patch |