diff options
| author | Stig <stig@stig.io> | 2023-11-21 16:19:17 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-21 16:19:17 +0100 |
| commit | 5142b8641019ca1e285ae473c4d38a2516de23b6 (patch) | |
| tree | 494ada512eb7730e65bbd1e73dbe928a7ca0d5d3 | |
| parent | c26a9e5fa2cf7d608f6ab26678479ce677903267 (diff) | |
| parent | 78cbf53e821616d3e63756ff83fa092a4914b23e (diff) | |
Merge pull request #268950 from stigtsp/perl/fix-hailo
perlPackages.Hailo: fix tests
| -rw-r--r-- | pkgs/development/perl-modules/Hailo-fix-test-gld.patch | 28 | ||||
| -rw-r--r-- | pkgs/top-level/perl-packages.nix | 3 |
2 files changed, 31 insertions, 0 deletions
diff --git a/pkgs/development/perl-modules/Hailo-fix-test-gld.patch b/pkgs/development/perl-modules/Hailo-fix-test-gld.patch new file mode 100644 index 0000000000000..24e45ac0c1ff1 --- /dev/null +++ b/pkgs/development/perl-modules/Hailo-fix-test-gld.patch @@ -0,0 +1,28 @@ +commit ce474dbca0c95c06a85a3a329fcdbcc97b8ad317 +Author: Stig Palmquist <git@stig.io> +Date: 2023-11-21 13:27:46 +0100 + + Fix t/shell.t compat with Getopt-Long-Descriptive 0.106 + +diff --git a/t/command/shell.t b/t/command/shell.t +index ebd67d8..a09afd2 100644 +--- a/t/command/shell.t ++++ b/t/command/shell.t +@@ -28,7 +28,7 @@ run_ok( $app, [ '--no-help' ], "Don't help me" ); + cmp_ok($return, '==', 1, 'Exit status is correct'); + like($stderr, qr/^$/s, 'no stderr'); + like($stdout, qr{usage: hailo}, 'Got usage header'); +- like($stdout, qr{progress\s+Display progress}, 'Got --progress'); ++ like($stdout, qr{progress\s*(?:\(or -p\))?\s+Display progress}, 'Got --progress'); + like($stdout, qr{files are assumed to be UTF-8 encoded}, 'Got UTF-8 note'); + unlike($stdout, qr{examples:}, "no examples on normal output"); + } +@@ -75,7 +75,7 @@ run_ok( $app, [ '--no-help' ], "Don't help me" ); + like($stderr, qr/^$/s, 'no stderr'); + like($stdout, qr/Unknown option: blah-blah-blah/, 'Unknown option'); + like($stdout, qr{usage: hailo}, 'Got usage header'); +- like($stdout, qr{progress\s+Display progress}, 'Got --progress'); ++ like($stdout, qr{progress\s*(?:\(or -p\))?\s+Display progress}, 'Got --progress'); + like($stdout, qr{files are assumed to be UTF-8 encoded}, 'Got UTF-8 note'); + unlike($stdout, qr{examples:}, "no examples on error"); + diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index eafccffef9c94..639bc2ae5d8a5 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -11348,6 +11348,9 @@ with self; { buildInputs = [ BotTrainingMegaHAL BotTrainingStarCraft DataSection FileSlurp PodSection TestException TestExpect TestOutput TestScript TestScriptRun ]; propagatedBuildInputs = [ ClassLoad DBDSQLite DataDump DirSelf FileCountLines GetoptLongDescriptive IOInteractive IPCSystemSimple ListMoreUtils Moose MooseXGetopt MooseXStrictConstructor MooseXTypes RegexpCommon TermSk namespaceclean ]; nativeBuildInputs = lib.optional stdenv.isDarwin shortenPerlShebang; + patches = [ + ../development/perl-modules/Hailo-fix-test-gld.patch + ]; postPatch = '' patchShebangs bin ''; |