diff options
Diffstat (limited to 'test/feh.t')
| -rw-r--r-- | test/feh.t | 36 |
1 files changed, 25 insertions, 11 deletions
@@ -2,7 +2,7 @@ use strict; use warnings; use 5.010; -use Test::Command tests => 71; +use Test::Command tests => 73; $ENV{HOME} = 'test'; @@ -34,13 +34,23 @@ if ( length($feh_name) == 0 ) { die($err_no_env); } +# Imlib2 1.6+ reports JPEG file format as 'jpg', older versions use 'jpeg'. +# Determine the output format used in this version with a --customlist call. +my $list_dir = 'list'; +if (qx{$feh --customlist %t test/ok/jpg} =~ m{jpg}) { + $list_dir = 'list_imlib2_1.6'; +} + my $version = qx{$feh --version}; 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}; @@ -93,14 +103,14 @@ $cmd->stderr_is_eq(''); $cmd = Test::Command->new( cmd => "$feh --list $images" ); $cmd->exit_is_num(0); -$cmd->stdout_is_file('test/list/default'); +$cmd->stdout_is_file("test/${list_dir}/default"); $cmd->stderr_like($re_warning); for my $sort (qw/name filename width height pixels size format/) { $cmd = Test::Command->new( cmd => "$feh --list $images --sort $sort" ); $cmd->exit_is_num(0); - $cmd->stdout_is_file("test/list/$sort"); + $cmd->stdout_is_file("test/${list_dir}/$sort"); $cmd->stderr_like($re_warning); } @@ -108,7 +118,7 @@ $cmd = Test::Command->new( cmd => "$feh --list $images --sort format --reverse" ); $cmd->exit_is_num(0); -$cmd->stdout_is_file('test/list/format_reverse'); +$cmd->stdout_is_file("test/${list_dir}/format_reverse"); $cmd->stderr_like($re_warning); $cmd = Test::Command->new( @@ -117,7 +127,7 @@ $cmd = Test::Command->new( $cmd->exit_is_num(0); # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=813729 -#$cmd->stdout_is_file('test/list/filename_recursive'); +#$cmd->stdout_is_file("test/${list_dir}/filename_recursive"); #$cmd->stderr_is_eq(''); # dummy tests to match number of planned tests $cmd->exit_is_num(0); @@ -127,19 +137,19 @@ $cmd = Test::Command->new( cmd => "$feh --customlist '%f; %h; %l; %m; %n; %p; " . "%s; %t; %u; %w' $images" ); $cmd->exit_is_num(0); -$cmd->stdout_is_file('test/list/custom'); +$cmd->stdout_is_file("test/${list_dir}/custom"); $cmd->stderr_like($re_warning); $cmd = Test::Command->new( cmd => "$feh --list --quiet $images" ); $cmd->exit_is_num(0); -$cmd->stdout_is_file('test/list/default'); +$cmd->stdout_is_file("test/${list_dir}/default"); $cmd->stderr_is_eq(''); $cmd = Test::Command->new( cmd => "$feh --quiet --list --action 'echo \"%f %wx%h\" >&2' $images" ); $cmd->exit_is_num(0); -$cmd->stdout_is_file('test/list/default'); +$cmd->stdout_is_file("test/${list_dir}/default"); $cmd->stderr_like($re_list_action); $cmd @@ -170,12 +180,16 @@ $cmd = Test::Command->new( cmd => "$feh --list --min-dimension 16x16 $images_ok" ); $cmd->exit_is_num(0); -$cmd->stdout_is_file('test/list/default'); +$cmd->stdout_is_file("test/${list_dir}/default"); $cmd->stderr_is_eq(''); $cmd = Test::Command->new( cmd => "$feh --list --max-dimension 16x16 $images_ok" ); $cmd->exit_is_num(0); -$cmd->stdout_is_file('test/list/default'); +$cmd->stdout_is_file("test/${list_dir}/default"); +$cmd->stderr_is_eq(''); + +$cmd = Test::Command->new( cmd => "$feh --list test/tiny.pbm" ); +$cmd->exit_is_num(0); $cmd->stderr_is_eq(''); |