From 50dce6b4df0bba360331e65133185953a7e70983 Mon Sep 17 00:00:00 2001 From: Daniel Friesel Date: Mon, 17 Jan 2011 20:50:23 +0100 Subject: test: Change HOME to avoid interferences with existing feh installations --- test/feh-bg.i | 3 ++- test/feh-scr.i | 2 +- test/feh.i | 2 +- test/feh.t | 3 ++- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/test/feh-bg.i b/test/feh-bg.i index e7b2f0b..3624f5c 100755 --- a/test/feh-bg.i +++ b/test/feh-bg.i @@ -10,7 +10,7 @@ use Time::HiRes qw/sleep/; my ($pid_xnest, $pid_twm); -$ENV{XDG_CONFIG_HOME} = "/tmp/feh-test-$$"; +$ENV{HOME} = 'test'; sub set_bg { my ($mode, $file) = @_; @@ -76,3 +76,4 @@ kill(15, $pid_xnest); sleep(0.2); unlink("/tmp/feh_${$}.png"); +unlink('test/.fehbg'); diff --git a/test/feh-scr.i b/test/feh-scr.i index 9f6d804..9696c9e 100755 --- a/test/feh-scr.i +++ b/test/feh-scr.i @@ -16,7 +16,7 @@ my ($width, $height); my $pwd = getcwd(); my $test_id = 0; -$ENV{XDG_CONFIG_HOME} = "/tmp/feh-test-$$"; +$ENV{HOME} = 'test'; sub waitfor(&) { my ($sub) = @_; diff --git a/test/feh.i b/test/feh.i index 748d20e..ad42732 100755 --- a/test/feh.i +++ b/test/feh.i @@ -12,7 +12,7 @@ my $win; my ($width, $height); my $pwd = getcwd(); -$ENV{XDG_CONFIG_HOME} = "/tmp/feh-test-$$"; +$ENV{HOME} = 'test'; sub waitfor(&) { my ($sub) = @_; diff --git a/test/feh.t b/test/feh.t index cff34c7..b08238b 100644 --- a/test/feh.t +++ b/test/feh.t @@ -4,7 +4,8 @@ use warnings; use 5.010; use Test::Command tests => 48; -$ENV{XDG_CONFIG_HOME} = "/tmp/feh-test-$$"; +$ENV{HOME} = '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'; -- cgit v1.2.3