Branch: refs/heads/blead
Home: https://github.com/Perl/perl5
Commit: 54446d4f70689e0027bf1e9ba86be8bca9904ee4
https://github.com/Perl/perl5/commit/54446d4f70689e0027bf1e9ba86be8bca9904ee4
Author: Andrew Hewus Fresh <afre...@openbsd.org>
Date: 2023-02-17 (Fri, 17 Feb 2023)
Changed paths:
M t/comp/parser.t
Log Message:
-----------
Calculate conflict markers instead of hardcoding
It turns out that some tooling (Game of Trees) has special handling for
conflict markers and will continually mark files that have them.
Since the test doesn't actually need them to be expanded,
calculate them instead to not trigger the detection.
Commit: befe556df0101b81e0df487e4a7c9b7b3ea1a832
https://github.com/Perl/perl5/commit/befe556df0101b81e0df487e4a7c9b7b3ea1a832
Author: Yves Orton <demer...@gmail.com>
Date: 2023-02-17 (Fri, 17 Feb 2023)
Changed paths:
M t/test.pl
Log Message:
-----------
t/test.pl - support NOTE comments in code for run_multiple_progs()
These comments will be autoremoved from the code before it is executed.
*Must* start the line, and have exactly one space between the comment
char and the NOTE string, which must be uppercased.
This will be used in the following patch.
Commit: 02d6071031bd9a27295cf9f217e280098e7d6b65
https://github.com/Perl/perl5/commit/02d6071031bd9a27295cf9f217e280098e7d6b65
Author: Yves Orton <demer...@gmail.com>
Date: 2023-02-17 (Fri, 17 Feb 2023)
Changed paths:
M t/test.pl
Log Message:
-----------
t/test.pl - support obfu conflict markers for code via run_multiple_progs()
This was we dont have to have literal conflict markers in test code
that is executed via run_multiple_progs(). For instance, t/lib/croak/toke
patch for that will follow.
Commit: a3129c9ac8adb96e5e5bbdd1a2856967692728ed
https://github.com/Perl/perl5/commit/a3129c9ac8adb96e5e5bbdd1a2856967692728ed
Author: Yves Orton <demer...@gmail.com>
Date: 2023-02-17 (Fri, 17 Feb 2023)
Changed paths:
M t/lib/croak/toke
Log Message:
-----------
t/lib/croak/toke - hide conflict markers in test code
This uses the previous two patches to add a NOTE comment
to the test for conflict markers explaining that we are using
the obfu style markers that run_multiple_progs() supports (now),
so that picky tools don't think we have conflict markers in
our files.
Compare: https://github.com/Perl/perl5/compare/e10136381f20...a3129c9ac8ad
