tjh.dev
nixpkgs mirror (for testing)
github.com/NixOS/nixpkgs
nix
1commit ce474dbca0c95c06a85a3a329fcdbcc97b8ad317
2Author: Stig Palmquist <git@stig.io>
3Date: 2023-11-21 13:27:46 +0100
4
5 Fix t/shell.t compat with Getopt-Long-Descriptive 0.106
6
7diff --git a/t/command/shell.t b/t/command/shell.t
8index ebd67d8..a09afd2 100644
9--- a/t/command/shell.t
10+++ b/t/command/shell.t
11@@ -28,7 +28,7 @@ run_ok( $app, [ '--no-help' ], "Don't help me" );
12 cmp_ok($return, '==', 1, 'Exit status is correct');
13 like($stderr, qr/^$/s, 'no stderr');
14 like($stdout, qr{usage: hailo}, 'Got usage header');
15- like($stdout, qr{progress\s+Display progress}, 'Got --progress');
16+ like($stdout, qr{progress\s*(?:\(or -p\))?\s+Display progress}, 'Got --progress');
17 like($stdout, qr{files are assumed to be UTF-8 encoded}, 'Got UTF-8 note');
18 unlike($stdout, qr{examples:}, "no examples on normal output");
19 }
20@@ -75,7 +75,7 @@ run_ok( $app, [ '--no-help' ], "Don't help me" );
21 like($stderr, qr/^$/s, 'no stderr');
22 like($stdout, qr/Unknown option: blah-blah-blah/, 'Unknown option');
23 like($stdout, qr{usage: hailo}, 'Got usage header');
24- like($stdout, qr{progress\s+Display progress}, 'Got --progress');
25+ like($stdout, qr{progress\s*(?:\(or -p\))?\s+Display progress}, 'Got --progress');
26 like($stdout, qr{files are assumed to be UTF-8 encoded}, 'Got UTF-8 note');
27 unlike($stdout, qr{examples:}, "no examples on error");
28