From 82efb76c026951ff102f46a44b5f0324aabd1b33 Mon Sep 17 00:00:00 2001 From: Daniel Friesel Date: Wed, 5 Apr 2023 23:05:36 +0200 Subject: feh.t: Adjust for magic=1 and imlib2 1.8+ --- test/feh.t | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/test/feh.t b/test/feh.t index 3ce8f9f..b9025b4 100644 --- a/test/feh.t +++ b/test/feh.t @@ -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}; -- cgit v1.2.3