Commit ca05961c authored by Birte Kristina Friesel's avatar Birte Kristina Friesel
Browse files

Update test files, fix omitted {} in list.c

parent 54deb9b8

src/list.c

+2 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ void init_list_mode(void) 
		file = FEH_FILE(l->data);

		if (opt.customlist)

			printf("%s\n", feh_printf(opt.customlist, file));

		else

		else {

			printf("%d\t%s\t%d\t%d\t%s", ++j,

					file->info->format, file->info->width,

					file->info->height,
@@ -52,6 +52,7 @@ void init_list_mode(void) 
			printf("\t%s\t%c\t%s\n",

					format_size(file->info->size),

					file->info->has_alpha ? 'X' : '-', file->filename);

		}



		feh_action_run(file, opt.actions[0]);

	}

test/feh.t

+2 −2
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ 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}\)};

my $re_list_action = qr{test/ok/... 16x16};



my $cmd = Test::Command->new(cmd => "$feh --version");
@@ -128,7 +128,7 @@ $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");

	"$feh --quiet --list --action 'echo \"%f %wx%h\" >&2' $images");



$cmd->exit_is_num(0);

$cmd->stdout_is_file('test/list/default');

test/list/default

+5 −5
Original line number Diff line number Diff line 
NUM	FORMAT	WIDTH	HEIGHT	PIXELS	SIZE(bytes)	ALPHA	FILENAME

NUM	FORMAT	WIDTH	HEIGHT	PIXELS	SIZE	ALPHA	FILENAME

1	gif	16	16	256 	953 	-	test/ok/gif

2	jpeg	16	16	256 	354 	-	test/ok/jpg

3	png	16	16	256 	403 	X	test/ok/png

test/list/filename_recursive

+6 −6
Original line number Diff line number Diff line 
NUM	FORMAT	WIDTH	HEIGHT	PIXELS	SIZE(bytes)	ALPHA	FILENAME

NUM	FORMAT	WIDTH	HEIGHT	PIXELS	SIZE	ALPHA	FILENAME

1	gif	16	16	256 	953 	-	test/ok/gif

2	jpeg	16	16	256 	354 	-	test/ok/jpg

3	png	16	16	256 	403 	X	test/ok/png

test/list/format_reverse

+5 −5
Original line number Diff line number Diff line 
NUM	FORMAT	WIDTH	HEIGHT	PIXELS	SIZE(bytes)	ALPHA	FILENAME

NUM	FORMAT	WIDTH	HEIGHT	PIXELS	SIZE	ALPHA	FILENAME

1	pnm	16	16	256 	269 	-	test/ok/pnm

2	png	16	16	256 	403 	X	test/ok/png

3	jpeg	16	16	256 	354 	-	test/ok/jpg