diff options
Diffstat (limited to 'test')
| -rwxr-xr-x | test/feh.i | 8 | ||||
| -rw-r--r-- | test/feh.t | 27 | ||||
| -rw-r--r-- | test/scr/caption_done | bin | 9669 -> 9603 bytes | |||
| -rw-r--r-- | test/scr/caption_new | bin | 19333 -> 19221 bytes | |||
| -rw-r--r-- | test/scr/caption_while | bin | 21458 -> 21269 bytes | |||
| -rw-r--r-- | test/scr/draw_action | bin | 8315 -> 8287 bytes | |||
| -rw-r--r-- | test/scr/draw_all_multi | bin | 11416 -> 11334 bytes | |||
| -rw-r--r-- | test/scr/draw_all_one | bin | 11113 -> 11045 bytes | |||
| -rw-r--r-- | test/scr/draw_filename | bin | 7796 -> 7804 bytes | |||
| -rw-r--r-- | test/scr/draw_filename_action | bin | 9549 -> 9525 bytes | |||
| -rw-r--r-- | test/scr/thumbnail_default | bin | 1712 -> 1712 bytes |
11 files changed, 14 insertions, 21 deletions
@@ -4,7 +4,7 @@ use warnings; use 5.010; use Cwd; -use Test::More tests => 102; +use Test::More tests => 103; use Time::HiRes qw/sleep/; use X11::GUITest qw/:ALL/; @@ -445,3 +445,9 @@ ok(waitfor { }, 'disabled screen clip'); feh_stop(); + +# GH-35 "Custom window title crashes feh on unloadable files" +$win = feh_start('--title "feh %h"', 'test/ok/png test/fail/png test/ok/jpg'); +SendKeys('{RIG}'); +test_win_title($win, 'feh 16'); +feh_stop(); @@ -2,7 +2,7 @@ use strict; use warnings; use 5.010; -use Test::Command tests => 63; +use Test::Command tests => 59; $ENV{HOME} = 'test'; @@ -10,7 +10,7 @@ my $feh = "src/feh"; my $images = 'test/ok/gif test/ok/jpg test/ok/png test/ok/pnm ' . 'test/fail/gif test/fail/jpg test/fail/png test/fail/pnm'; -my ($feh_name, $feh_version) = @ENV{'PACKAGE', 'VERSION'}; +my $feh_name = $ENV{'PACKAGE'}; # These tests are meant to run non-interactively and without X. # make sure they are capable of doing so. @@ -18,18 +18,17 @@ delete $ENV{'DISPLAY'}; my $err_no_env = <<'EOF'; -Unable to determine feh PACKAGE or VERSION. +Unable to determine feh PACKAGE. This is most likely because you ran 'prove test' or 'perl test/feh.t'. -Sinc this test uses make variables and is therefore designed to be run from +Since this test uses make variables and is therefore designed to be run from the Makefile only, use 'make test' instead. If you absolutely need to run it the other way, use - PACKAGE=feh VERSION=1.5 ${your_command} -(with the appropiate values, of course). + PACKAGE=feh ${your_command} EOF -if (length($feh_name) == 0 or length($feh_version) == 0) { +if (length($feh_name) == 0) { die($err_no_env); } @@ -39,21 +38,9 @@ my $re_loadable = qr{test/ok/...}; my $re_unloadable = qr{test/fail/...}; my $re_list_action = qr{test/ok/... 16x16 \(${feh_name}\)}; -my $cmd = Test::Command->new(cmd => $feh); - -# Insufficient Arguments -> Usage should return failure -$cmd->exit_is_num(1, 'missing arguments return 1'); -$cmd->stdout_is_eq('', 'missing arguments print usage (!stdout)'); -$cmd->stderr_is_eq(<<"EOF", 'missing arguments print usage (stderr)'); -${feh_name} - No loadable images specified. -Use ${feh_name} --help for detailed usage information -EOF - -$cmd = Test::Command->new(cmd => "$feh --version"); +my $cmd = Test::Command->new(cmd => "$feh --version"); $cmd->exit_is_num(0); -$cmd->stdout_is_eq("${feh_name} version ${feh_version}\n" - . "Compile-time switches: curl xinerama \n"); $cmd->stderr_is_eq(''); $cmd = Test::Command->new(cmd => "$feh --loadable $images"); diff --git a/test/scr/caption_done b/test/scr/caption_done Binary files differindex d178e7e..d873599 100644 --- a/test/scr/caption_done +++ b/test/scr/caption_done diff --git a/test/scr/caption_new b/test/scr/caption_new Binary files differindex fc438fd..54d48ac 100644 --- a/test/scr/caption_new +++ b/test/scr/caption_new diff --git a/test/scr/caption_while b/test/scr/caption_while Binary files differindex e9db559..313565a 100644 --- a/test/scr/caption_while +++ b/test/scr/caption_while diff --git a/test/scr/draw_action b/test/scr/draw_action Binary files differindex 4a2b06c..3c49ba1 100644 --- a/test/scr/draw_action +++ b/test/scr/draw_action diff --git a/test/scr/draw_all_multi b/test/scr/draw_all_multi Binary files differindex d105fbe..0153eb7 100644 --- a/test/scr/draw_all_multi +++ b/test/scr/draw_all_multi diff --git a/test/scr/draw_all_one b/test/scr/draw_all_one Binary files differindex 7a3b796..f33566c 100644 --- a/test/scr/draw_all_one +++ b/test/scr/draw_all_one diff --git a/test/scr/draw_filename b/test/scr/draw_filename Binary files differindex dc32356..eea7dab 100644 --- a/test/scr/draw_filename +++ b/test/scr/draw_filename diff --git a/test/scr/draw_filename_action b/test/scr/draw_filename_action Binary files differindex 6039def..73f9afd 100644 --- a/test/scr/draw_filename_action +++ b/test/scr/draw_filename_action diff --git a/test/scr/thumbnail_default b/test/scr/thumbnail_default Binary files differindex 2c52059..eade08b 100644 --- a/test/scr/thumbnail_default +++ b/test/scr/thumbnail_default |