From f35b6c221134784b2f53f15b72b809d93f03a5ca Mon Sep 17 00:00:00 2001
From: Daniel Friesel <derf@finalrewind.org>
Date: Sun, 3 Oct 2010 00:38:05 +0200
Subject: Clean up test directory

---
 test/feh.t | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

(limited to 'test/feh.t')

diff --git a/test/feh.t b/test/feh.t
index 67fb269..e142e63 100644
--- a/test/feh.t
+++ b/test/feh.t
@@ -6,7 +6,7 @@ use Test::Command tests => 48;
 
 my $fehrc = "/tmp/.fehrc-$$";
 my $feh = "src/feh --rcfile $fehrc";
-my $images = 'test/ok.* test/fail.*';
+my $images = 'test/ok/* test/fail/*';
 
 my ($feh_name, $feh_version) = @ENV{'PACKAGE', 'VERSION'};
 
@@ -37,10 +37,10 @@ if (length($feh_name) == 0 or length($feh_version) == 0) {
 }
 
 my $re_warning =
-	qr{${feh_name} WARNING: test/fail\.... \- No Imlib2 loader for that file format\n};
-my $re_loadable = qr{test/ok\....};
-my $re_unloadable = qr{test/fail\....};
-my $re_list_action = qr{test/ok\.... 16x16 \(${feh_name}\)};
+	qr{${feh_name} WARNING: test/fail/... \- No Imlib2 loader for that file format\n};
+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);
 
@@ -73,40 +73,40 @@ $cmd->stderr_is_eq('');
 $cmd = Test::Command->new(cmd => "$feh --list $images");
 
 $cmd->exit_is_num(0);
-$cmd->stdout_is_file('test/list');
+$cmd->stdout_is_file('test/list/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/$sort");
 	$cmd->stderr_like($re_warning);
 }
 
 $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/format_reverse');
 $cmd->stderr_like($re_warning);
 
 $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/customlist');
+$cmd->stdout_is_file('test/list/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');
+$cmd->stdout_is_file('test/list/default');
 $cmd->stderr_is_eq('');
 
 $cmd = Test::Command->new(cmd =>
 	"$feh --quiet --list --action 'echo \"%f %wx%h (%P)\" >&2' $images");
 
 $cmd->exit_is_num(0);
-$cmd->stdout_is_file('test/list');
+$cmd->stdout_is_file('test/list/default');
 $cmd->stderr_like($re_list_action);
 
 unlink($fehrc);
-- 
cgit v1.2.3