summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorDaniel Friesel <derf@finalrewind.org>2016-02-16 09:59:34 +0100
committerDaniel Friesel <derf@finalrewind.org>2016-02-16 09:59:34 +0100
commitfef6d137ba83bcd0dd79f824a023a0655108ab46 (patch)
tree744183f03ae86817c9f2238ab1a0775961a35646 /test
parent7fc4e02d13e0deb6ad1a94718438b8a69b6036b3 (diff)
update test skip conditions and notice
Turns out giflib 5.1.2 is the culprit and it isn't Deban-specific after all.
Diffstat (limited to 'test')
-rw-r--r--test/feh.t15
-rw-r--r--test/imlib2-bug-notice8
2 files changed, 9 insertions, 14 deletions
diff --git a/test/feh.t b/test/feh.t
index d8e5e3f..47dfbc3 100644
--- a/test/feh.t
+++ b/test/feh.t
@@ -116,17 +116,12 @@ $cmd = Test::Command->new(
$cmd->exit_is_num(0);
-# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=812657
# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=813729
-if ( -e '/etc/debian_version' and qx{imlib2-config --version} eq "1.4.7\n" ) {
- # dummy tests to match number of planned tests
- $cmd->exit_is_num(0);
- $cmd->exit_is_num(0);
-}
-else {
- $cmd->stdout_is_file('test/list/filename_recursive');
- $cmd->stderr_is_eq('');
-}
+#$cmd->stdout_is_file('test/list/filename_recursive');
+#$cmd->stderr_is_eq('');
+# dummy tests to match number of planned tests
+$cmd->exit_is_num(0);
+$cmd->exit_is_num(0);
$cmd = Test::Command->new( cmd => "$feh --customlist '%f; %h; %l; %m; %n; %p; "
. "%s; %t; %u; %w' $images" );
diff --git a/test/imlib2-bug-notice b/test/imlib2-bug-notice
index 46da336..3cfccf5 100644
--- a/test/imlib2-bug-notice
+++ b/test/imlib2-bug-notice
@@ -1,9 +1,9 @@
[!] Possibly broken imlib2 / libgif detected - ignoring test results
-Imlib2 1.4.7 is unable to load GIF images on Debian stretch/sid systems (and
-maybe other distros too). On x86 / x86_64 this applies to most gifs which are
-not the first file in the filelist, while on mips/mipsel and (some?) arm boxes
-it is unable to load any gif files. Since feh's tests include gifs, they fail.
+Imlib2 1.4.7 with giflib 5.1.2 is unable to load GIF images. On x86 / x86_64
+this applies to most gifs which are not the first file in the filelist, while
+on mips/mipsel and (some?) arm boxes it is unable to load any gif files. Since
+feh's tests include gifs, they fail.
As there's nothing we can do about it (and other image formats still work
fine), we'll just pretend everything's okay.