And use the helper routine for generating the output filename.
Signed-off-by: Bryce Harrington <[email protected]>
---
tests/internal-screenshot-test.c | 42 ++++++++++++++++++++++++++++------------
1 file changed, 30 insertions(+), 12 deletions(-)
diff --git a/tests/internal-screenshot-test.c b/tests/internal-screenshot-test.c
index 2d6f8e7..7f1a690 100644
--- a/tests/internal-screenshot-test.c
+++ b/tests/internal-screenshot-test.c
@@ -31,6 +31,34 @@
char *server_parameters="--use-pixman --width=320 --height=240";
+/** write_surface_as_png()
+ *
+ * Writes out a given weston test surface to disk as a PNG image
+ * using the provided filename (with path).
+ *
+ * @returns true if successfully saved file; false otherwise.
+ */
+static bool
+write_surface_as_png(const struct surface* weston_surface, const char *fname) {
+ cairo_surface_t *cairo_surface;
+ cairo_status_t status;
+
+ cairo_surface =
cairo_image_surface_create_for_data(weston_surface->data,
+ CAIRO_FORMAT_ARGB32,
+
weston_surface->width,
+
weston_surface->height,
+
weston_surface->stride);
+ printf("Writing PNG to disk\n");
+ status = cairo_surface_write_to_png(cairo_surface, fname);
+ if (status != CAIRO_STATUS_SUCCESS) {
+ printf("Failed to save screenshot: %s\n",
+ cairo_status_to_string(status));
+ return false;
+ }
+ cairo_surface_destroy(cairo_surface);
+ return true;
+}
+
TEST(internal_screenshot)
{
struct client *client;
@@ -123,18 +151,8 @@ TEST(internal_screenshot)
/* Test dumping of non-matching images */
if (!match || dump_all_images) {
- /* Write image to .png file */
- cairo_surface_t *surface;
-
- surface = cairo_image_surface_create_for_data(screenshot->data,
-
CAIRO_FORMAT_ARGB32,
- screenshot->width,
-
screenshot->height,
-
screenshot->stride);
-
- printf("Writing PNG to disk\n");
- cairo_surface_write_to_png(surface,
"clientside-screenshot.png");
- cairo_surface_destroy(surface);
+ fname = screenshot_output_filename("internal-screenshot", 0);
+ write_surface_as_png(screenshot, fname);
}
free(screenshot);
--
1.9.1
_______________________________________________
wayland-devel mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/wayland-devel
