Skip to content

Commit

Permalink
feh.t: Adjust for magic=1 and imlib2 1.8+
Browse files Browse the repository at this point in the history
  • Loading branch information
derf committed Apr 5, 2023
1 parent 421273d commit 82efb76
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion test/feh.t
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,11 @@ if ( $version =~ m{ Compile-time \s switches : \s .* help }ox ) {
$has_help = 1;
}

# Imlib2 1.8+ returns "Invalid image file" rather than "No Imlib2 loader".
# feh compiled with magic=1 returns "Does not look like an image (magic bytes missing)"
# Here, we accept all three.
my $re_warning
= qr{${feh_name} WARNING: test/fail/... \- No Imlib2 loader for that file format\n};
= qr{${feh_name} WARNING: test/fail/... \- (Invalid image file|No Imlib2 loader for that file format|Does not look like an image \(magic bytes missing\))\n};
my $re_loadable = qr{test/ok/...};
my $re_unloadable = qr{test/fail/...};
my $re_list_action = qr{test/ok/... 16x16};
Expand Down

0 comments on commit 82efb76

Please sign in to comment.