mirrors/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tests: move check_screen() into client helpers

Browse Source 
This will be useful in more tests.

No changes to the code, aside from dropping one 'static'.

Copyright 2017 is taken from git-blame of the moved code.

Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.com>
This commit is contained in:
Pekka Paalanen 2020-01-22 16:34:01 +02:00
parent 8060d826b7
commit 9b682302b8
3 changed files with 73 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
tests/subsurface-shot-test.c
View File

@ -115,71 +115,6 @@ color(pixman_color_t *tmp, uint8_t r, uint8_t g, uint8_t b)
return tmp;
}
static void
write_visual_diff(pixman_image_t *ref_image,
struct buffer *shot,
const struct rectangle *clip,
const char *test_name,
int seq_no,
const struct range *fuzz)
{
char *fname;
char *ext_test_name;
pixman_image_t *diff;
int ret;
ret = asprintf(&ext_test_name, "%s-diff", test_name);
assert(ret >= 0);
fname = screenshot_output_filename(ext_test_name, seq_no);
diff = visualize_image_difference(ref_image, shot->image, clip, fuzz);
write_image_as_png(diff, fname);
pixman_image_unref(diff);
free(fname);
free(ext_test_name);
}
static int
check_screen(struct client *client,
const char *ref_image,
int ref_seq_no,
const struct rectangle *clip,
int seq_no)
{
const char *test_name = get_test_name();
const struct range gl_fuzz = { 0, 1 };
struct buffer *shot;
pixman_image_t *ref;
char *ref_fname;
char *shot_fname;
bool match;
ref_fname = screenshot_reference_filename(ref_image, ref_seq_no);
shot_fname = screenshot_output_filename(test_name, seq_no);
ref = load_image_from_png(ref_fname);
assert(ref);
shot = capture_screenshot_of_output(client);
assert(shot);
match = check_images_match(ref, shot->image, clip, &gl_fuzz);
testlog("ref %s vs. shot %s: %s\n", ref_fname, shot_fname,
match ? "PASS" : "FAIL");
write_image_as_png(shot->image, shot_fname);
if (!match)
write_visual_diff(ref, shot, clip, test_name, seq_no, &gl_fuzz);
buffer_destroy(shot);
pixman_image_unref(ref);
free(ref_fname);
free(shot_fname);
return match ? 0 : -1;
}
static struct buffer *
surface_commit_color(struct client *client, struct wl_surface *surface,
pixman_color_t *color, int width, int height)

66
tests/weston-test-client-helper.c
View File

@ -1,5 +1,6 @@
/*
* Copyright © 2012 Intel Corporation
* Copyright 2017 Collabora, Ltd.
*
* Permission is hereby granted, free of charge, to any person obtaining
* a copy of this software and associated documentation files (the
@ -1516,3 +1517,68 @@ capture_screenshot_of_output(struct client *client)
return buffer;
}
static void
write_visual_diff(pixman_image_t *ref_image,
struct buffer *shot,
const struct rectangle *clip,
const char *test_name,
int seq_no,
const struct range *fuzz)
{
char *fname;
char *ext_test_name;
pixman_image_t *diff;
int ret;
ret = asprintf(&ext_test_name, "%s-diff", test_name);
assert(ret >= 0);
fname = screenshot_output_filename(ext_test_name, seq_no);
diff = visualize_image_difference(ref_image, shot->image, clip, fuzz);
write_image_as_png(diff, fname);
pixman_image_unref(diff);
free(fname);
free(ext_test_name);
}
int
check_screen(struct client *client,
const char *ref_image,
int ref_seq_no,
const struct rectangle *clip,
int seq_no)
{
const char *test_name = get_test_name();
const struct range gl_fuzz = { 0, 1 };
struct buffer *shot;
pixman_image_t *ref;
char *ref_fname;
char *shot_fname;
bool match;
ref_fname = screenshot_reference_filename(ref_image, ref_seq_no);
shot_fname = screenshot_output_filename(test_name, seq_no);
ref = load_image_from_png(ref_fname);
assert(ref);
shot = capture_screenshot_of_output(client);
assert(shot);
match = check_images_match(ref, shot->image, clip, &gl_fuzz);
testlog("ref %s vs. shot %s: %s\n", ref_fname, shot_fname,
match ? "PASS" : "FAIL");
write_image_as_png(shot->image, shot_fname);
if (!match)
write_visual_diff(ref, shot, clip, test_name, seq_no, &gl_fuzz);
buffer_destroy(shot);
pixman_image_unref(ref);
free(ref_fname);
free(shot_fname);
return match ? 0 : -1;
}

7
tests/weston-test-client-helper.h
View File

@ -246,4 +246,11 @@ load_image_from_png(const char *fname);
struct buffer *
capture_screenshot_of_output(struct client *client);
int
check_screen(struct client *client,
const char *ref_image,
int ref_seq_no,
const struct rectangle *clip,
int seq_no);
#endif