summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Friesel <daniel.friesel@uos.de>2023-04-05 23:05:36 +0200
committerDaniel Friesel <daniel.friesel@uos.de>2023-04-05 23:05:36 +0200
commit82efb76c026951ff102f46a44b5f0324aabd1b33 (patch)
treeeded4cd928342d946462fc116c5e723218e8e60c
parent421273de0c33da276dd8c1bfb19fe902e999521d (diff)
feh.t: Adjust for magic=1 and imlib2 1.8+
-rw-r--r--test/feh.t5
1 files changed, 4 insertions, 1 deletions
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};