From 788fa40bbf04868c3836c9b086c9979649e2c516 Mon Sep 17 00:00:00 2001
From: Daniel Friesel <derf@finalrewind.org>
Date: Sat, 15 Jan 2011 11:10:32 +0100
Subject: Update tests
---
src/keyevents.c | 2 +-
test/feh-bg.i | 2 ++
test/feh-scr.i | 2 ++
test/feh.i | 2 ++
test/feh.t | 11 ++---------
5 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/src/keyevents.c b/src/keyevents.c
index 8e7251d..f3a6624 100644
--- a/src/keyevents.c
+++ b/src/keyevents.c
@@ -162,7 +162,7 @@ void init_keyevents(void) {
free(confpath);
- if (!conf)
+ if (!conf && ((conf = fopen("/etc/feh/keys", "r")) == NULL))
return;
while (fgets(line, sizeof(line), conf)) {
diff --git a/test/feh-bg.i b/test/feh-bg.i
index eeff836..e7b2f0b 100755
--- a/test/feh-bg.i
+++ b/test/feh-bg.i
@@ -10,6 +10,8 @@ use Time::HiRes qw/sleep/;
my ($pid_xnest, $pid_twm);
+$ENV{XDG_CONFIG_HOME} = "/tmp/feh-test-$$";
+
sub set_bg {
my ($mode, $file) = @_;
diff --git a/test/feh-scr.i b/test/feh-scr.i
index 098f1c0..9f6d804 100755
--- a/test/feh-scr.i
+++ b/test/feh-scr.i
@@ -16,6 +16,8 @@ my ($width, $height);
my $pwd = getcwd();
my $test_id = 0;
+$ENV{XDG_CONFIG_HOME} = "/tmp/feh-test-$$";
+
sub waitfor(&) {
my ($sub) = @_;
my $out;
diff --git a/test/feh.i b/test/feh.i
index ffa9c5a..748d20e 100755
--- a/test/feh.i
+++ b/test/feh.i
@@ -12,6 +12,8 @@ my $win;
my ($width, $height);
my $pwd = getcwd();
+$ENV{XDG_CONFIG_HOME} = "/tmp/feh-test-$$";
+
sub waitfor(&) {
my ($sub) = @_;
my $out;
diff --git a/test/feh.t b/test/feh.t
index a3a5650..cff34c7 100644
--- a/test/feh.t
+++ b/test/feh.t
@@ -4,8 +4,8 @@ use warnings;
use 5.010;
use Test::Command tests => 48;
-my $fehrc = "/tmp/.fehrc-$$";
-my $feh = "src/feh --rcfile $fehrc";
+$ENV{XDG_CONFIG_HOME} = "/tmp/feh-test-$$";
+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';
@@ -15,11 +15,6 @@ my ($feh_name, $feh_version) = @ENV{'PACKAGE', 'VERSION'};
# make sure they are capable of doing so.
delete $ENV{'DISPLAY'};
-# Create empty fehrc so that feh does not create one in $HOME
-# (mostly for build servers)
-open(my $fh, '>', $fehrc) or die("Can't create $fehrc: $!");
-close($fh) or die("Can't close $fehrc: $!");
-
my $err_no_env = <<'EOF';
Unable to determine feh PACKAGE or VERSION.
@@ -109,5 +104,3 @@ $cmd = Test::Command->new(cmd =>
$cmd->exit_is_num(0);
$cmd->stdout_is_file('test/list/default');
$cmd->stderr_like($re_list_action);
-
-unlink($fehrc);
--
cgit v1.2.3