Commit 788fa40b authored by Birte Kristina Friesel's avatar Birte Kristina Friesel
Browse files

Update tests

parent 11d7a68d

src/keyevents.c

+1 −1
Original line number Diff line number Diff line
@@ -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)) {

test/feh-bg.i

+2 −0
Original line number Diff line number Diff line
@@ -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) = @_;

test/feh-scr.i

+2 −0
Original line number Diff line number Diff line
@@ -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;

test/feh.i

+2 −0
Original line number Diff line number Diff line
@@ -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;

test/feh.t

+2 −9
Original line number Diff line number Diff line
@@ -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);