diff options
author | Daniel Friesel <derf@finalrewind.org> | 2011-01-15 11:10:32 +0100 |
---|---|---|
committer | Daniel Friesel <derf@finalrewind.org> | 2011-01-15 11:10:32 +0100 |
commit | 788fa40bbf04868c3836c9b086c9979649e2c516 (patch) | |
tree | 246585290fe7ef5ef9d1bb4eb8dc277e45bcf018 /test | |
parent | 11d7a68de63112305d833e802db0b4654c846b77 (diff) |
Update tests
Diffstat (limited to 'test')
-rwxr-xr-x | test/feh-bg.i | 2 | ||||
-rwxr-xr-x | test/feh-scr.i | 2 | ||||
-rwxr-xr-x | test/feh.i | 2 | ||||
-rw-r--r-- | test/feh.t | 11 |
4 files changed, 8 insertions, 9 deletions
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; @@ -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; @@ -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); |