From fa6c6e9b7fc0e742b5067ba2a34a70f6345f218e Mon Sep 17 00:00:00 2001 From: Ludovico de Nittis <ludovico.denittis@collabora.com> Date: Wed, 27 Jan 2021 12:59:01 +0100 Subject: [PATCH] check-vulkan: Print JSON results in stdout With the commit 0d0b054ac we redirected the JSON results to stderr as a stopgap solution. Now we revert that and print the results in stdout so that we can implement a proper parsing. Signed-off-by: Ludovico de Nittis <ludovico.denittis@collabora.com> --- helpers/check-vulkan.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/helpers/check-vulkan.c b/helpers/check-vulkan.c index e8303509c..598148abb 100644 --- a/helpers/check-vulkan.c +++ b/helpers/check-vulkan.c @@ -1372,16 +1372,14 @@ int main (int argc, goto out; for (i = 0; i < physical_device_count; i++) - print_physical_device_info (physical_devices[i], stderr); + print_physical_device_info (physical_devices[i], original_stdout); for (i = 0; i < physical_device_count; i++) { result = draw_test_triangle (vk_instance, physical_devices[i], error); - print_draw_test_result (i, result, local_error, stderr); - - if (local_error != NULL) - g_printerr ("%s", local_error->message); + print_draw_test_result (i, result, local_error, original_stdout); + /* The eventual error has already been included in the drawing test JSON */ g_clear_error (error); /* Return exit success if we are able to draw with at least one device */ -- GitLab