From cee2190b5d44ad5c64069563746c7f9a0be6d75d Mon Sep 17 00:00:00 2001 From: David Heidelberg Date: Thu, 23 May 2024 18:54:05 -0700 Subject: [PATCH] ext_external_objects: avoid stderr when we skip the test We skipping the test, when we don't have Vulkan available, rather print to stdout to avoid highlighted lines in the log. Signed-off-by: David Heidelberg Part-of: --- tests/spec/ext_external_objects/vk.c | 2 +- tests/spec/ext_external_objects/vk_buf_exchange.c | 2 +- tests/spec/ext_external_objects/vk_depth_display.c | 2 +- tests/spec/ext_external_objects/vk_image_display.c | 2 +- .../spec/ext_external_objects/vk_image_display_multiple_textures.c | 2 +- tests/spec/ext_external_objects/vk_image_display_overwrite.c | 2 +- tests/spec/ext_external_objects/vk_image_overwrite.c | 2 +- tests/spec/ext_external_objects/vk_pix_buf_update_errors.c | 2 +- tests/spec/ext_external_objects/vk_semaphores.c | 2 +- tests/spec/ext_external_objects/vk_semaphores2.c | 2 +- tests/spec/ext_external_objects/vk_stencil_display.c | 2 +- tests/spec/ext_external_objects/vk_vert_buf_reuse.c | 6 +++--- tests/spec/ext_external_objects/vk_vert_buf_update_errors.c | 4 ++-- 13 files changed, 16 insertions(+), 16 deletions(-) diff --git a/tests/spec/ext_external_objects/vk.c b/tests/spec/ext_external_objects/vk.c index d5ff36097..a39066832 100644 --- a/tests/spec/ext_external_objects/vk.c +++ b/tests/spec/ext_external_objects/vk.c @@ -1022,7 +1022,7 @@ bool vk_init_ctx_for_rendering(struct vk_ctx *ctx) { if (!vk_init_ctx(ctx)) { - fprintf(stderr, "Failed to initialize Vulkan.\n"); + fprintf(stdout, "Failed to initialize Vulkan.\n"); return false; } diff --git a/tests/spec/ext_external_objects/vk_buf_exchange.c b/tests/spec/ext_external_objects/vk_buf_exchange.c index 9034d1eca..412b36077 100644 --- a/tests/spec/ext_external_objects/vk_buf_exchange.c +++ b/tests/spec/ext_external_objects/vk_buf_exchange.c @@ -114,7 +114,7 @@ piglit_init(int argc, char **argv) color_tiling, depth_tiling, color_in_layout, depth_in_layout, color_end_layout, depth_end_layout)) { - fprintf(stderr, "Failed to initialize Vulkan, skipping the test.\n"); + fprintf(stdout, "Failed to initialize Vulkan, skipping the test.\n"); piglit_report_result(PIGLIT_SKIP); } diff --git a/tests/spec/ext_external_objects/vk_depth_display.c b/tests/spec/ext_external_objects/vk_depth_display.c index ecfd5e16f..abc7a77a7 100644 --- a/tests/spec/ext_external_objects/vk_depth_display.c +++ b/tests/spec/ext_external_objects/vk_depth_display.c @@ -134,7 +134,7 @@ piglit_init(int argc, char **argv) atexit(cleanup); if (!vk_init()) { - fprintf(stderr, "Failed to initialize Vulkan, skipping the test.\n"); + fprintf(stdout, "Failed to initialize Vulkan, skipping the test.\n"); piglit_report_result(PIGLIT_SKIP); } diff --git a/tests/spec/ext_external_objects/vk_image_display.c b/tests/spec/ext_external_objects/vk_image_display.c index 869fdb028..5e00b600d 100644 --- a/tests/spec/ext_external_objects/vk_image_display.c +++ b/tests/spec/ext_external_objects/vk_image_display.c @@ -113,7 +113,7 @@ void piglit_init(int argc, char **argv) color_tiling, depth_tiling, color_in_layout, depth_in_layout, color_end_layout, depth_end_layout)) { - fprintf(stderr, "Failed to initialize Vulkan, skipping the test.\n"); + fprintf(stdout, "Failed to initialize Vulkan, skipping the test.\n"); piglit_report_result(PIGLIT_SKIP); } /* create memory object and gl texture */ diff --git a/tests/spec/ext_external_objects/vk_image_display_multiple_textures.c b/tests/spec/ext_external_objects/vk_image_display_multiple_textures.c index 00ff26f17..5a8fa6cca 100644 --- a/tests/spec/ext_external_objects/vk_image_display_multiple_textures.c +++ b/tests/spec/ext_external_objects/vk_image_display_multiple_textures.c @@ -117,7 +117,7 @@ void piglit_init(int argc, char **argv) color_tiling, depth_tiling, color_in_layout, depth_in_layout, color_end_layout, depth_end_layout)) { - fprintf(stderr, "Failed to initialize Vulkan, skipping the test.\n"); + fprintf(stdout, "Failed to initialize Vulkan, skipping the test.\n"); piglit_report_result(PIGLIT_SKIP); } diff --git a/tests/spec/ext_external_objects/vk_image_display_overwrite.c b/tests/spec/ext_external_objects/vk_image_display_overwrite.c index 09ba7f0db..4b357aa7f 100644 --- a/tests/spec/ext_external_objects/vk_image_display_overwrite.c +++ b/tests/spec/ext_external_objects/vk_image_display_overwrite.c @@ -144,7 +144,7 @@ void piglit_init(int argc, char **argv) color_tiling, depth_tiling, color_in_layout, depth_in_layout, color_end_layout, depth_end_layout)) { - fprintf(stderr, "Failed to initialize Vulkan, skipping the test.\n"); + fprintf(stdout, "Failed to initialize Vulkan, skipping the test.\n"); piglit_report_result(PIGLIT_SKIP); } diff --git a/tests/spec/ext_external_objects/vk_image_overwrite.c b/tests/spec/ext_external_objects/vk_image_overwrite.c index a4aefc217..b2cd68739 100644 --- a/tests/spec/ext_external_objects/vk_image_overwrite.c +++ b/tests/spec/ext_external_objects/vk_image_overwrite.c @@ -292,7 +292,7 @@ static bool vk_init(void) { if (!vk_init_ctx(&vk_core)) { - fprintf(stderr, "Failed to initialize Vulkan\n"); + fprintf(stdout, "Failed to initialize Vulkan\n"); return false; } diff --git a/tests/spec/ext_external_objects/vk_pix_buf_update_errors.c b/tests/spec/ext_external_objects/vk_pix_buf_update_errors.c index 3570d8829..32b870ddd 100644 --- a/tests/spec/ext_external_objects/vk_pix_buf_update_errors.c +++ b/tests/spec/ext_external_objects/vk_pix_buf_update_errors.c @@ -130,7 +130,7 @@ piglit_init(int argc, char **argv) color_tiling, depth_tiling, color_in_layout, depth_in_layout, color_end_layout, depth_end_layout)) { - fprintf(stderr, "Failed to initialize Vulkan, skipping the test.\n"); + fprintf(stdout, "Failed to initialize Vulkan, skipping the test.\n"); piglit_report_result(PIGLIT_SKIP); } diff --git a/tests/spec/ext_external_objects/vk_semaphores.c b/tests/spec/ext_external_objects/vk_semaphores.c index c7610611b..a83d8465f 100644 --- a/tests/spec/ext_external_objects/vk_semaphores.c +++ b/tests/spec/ext_external_objects/vk_semaphores.c @@ -115,7 +115,7 @@ void piglit_init(int argc, char **argv) color_tiling, depth_tiling, color_in_layout, depth_in_layout, color_end_layout, depth_end_layout)) { - fprintf(stderr, "Failed to initialize Vulkan, skipping the test.\n"); + fprintf(stdout, "Failed to initialize Vulkan, skipping the test.\n"); piglit_report_result(PIGLIT_SKIP); } /* create memory object and gl texture */ diff --git a/tests/spec/ext_external_objects/vk_semaphores2.c b/tests/spec/ext_external_objects/vk_semaphores2.c index 44c921251..7e0158e60 100644 --- a/tests/spec/ext_external_objects/vk_semaphores2.c +++ b/tests/spec/ext_external_objects/vk_semaphores2.c @@ -146,7 +146,7 @@ void piglit_init(int argc, char **argv) color_tiling, depth_tiling, color_in_layout, depth_in_layout, color_end_layout, depth_end_layout)) { - fprintf(stderr, "Failed to initialize Vulkan, skipping the test.\n"); + fprintf(stdout, "Failed to initialize Vulkan, skipping the test.\n"); piglit_report_result(PIGLIT_SKIP); } diff --git a/tests/spec/ext_external_objects/vk_stencil_display.c b/tests/spec/ext_external_objects/vk_stencil_display.c index 6d579e3e8..c57040402 100644 --- a/tests/spec/ext_external_objects/vk_stencil_display.c +++ b/tests/spec/ext_external_objects/vk_stencil_display.c @@ -133,7 +133,7 @@ piglit_init(int argc, char **argv) atexit(cleanup); if (!vk_init()) { - fprintf(stderr, "Failed to initialize Vulkan, skipping the test.\n"); + fprintf(stdout, "Failed to initialize Vulkan, skipping the test.\n"); piglit_report_result(PIGLIT_SKIP); } diff --git a/tests/spec/ext_external_objects/vk_vert_buf_reuse.c b/tests/spec/ext_external_objects/vk_vert_buf_reuse.c index 16613eb13..597212bbc 100644 --- a/tests/spec/ext_external_objects/vk_vert_buf_reuse.c +++ b/tests/spec/ext_external_objects/vk_vert_buf_reuse.c @@ -123,7 +123,7 @@ piglit_init(int argc, char **argv) atexit(cleanup); if (!vk_init()) { - fprintf(stderr, "Failed to initialize Vulkan, skipping the test.\n"); + fprintf(stdout, "Failed to initialize Vulkan, skipping the test.\n"); piglit_report_result(PIGLIT_SKIP); } @@ -248,7 +248,7 @@ static bool vk_init() { if (!vk_init_ctx_for_rendering(&vk_core)) { - fprintf(stderr, "Failed to initialize Vulkan context.\n"); + fprintf(stdout, "Failed to initialize Vulkan context.\n"); return false; } @@ -273,7 +273,7 @@ vk_init() vkUnmapMemory(vk_core.dev, vk_vb.mobj.mem); if (!vk_init_vulkan_drawing()) { - fprintf(stderr, "Failed to initialize Vulkan drawing.\n"); + fprintf(stdout, "Failed to initialize Vulkan drawing.\n"); return false; } return true; diff --git a/tests/spec/ext_external_objects/vk_vert_buf_update_errors.c b/tests/spec/ext_external_objects/vk_vert_buf_update_errors.c index ab6b9aa9b..f6972f960 100644 --- a/tests/spec/ext_external_objects/vk_vert_buf_update_errors.c +++ b/tests/spec/ext_external_objects/vk_vert_buf_update_errors.c @@ -89,7 +89,7 @@ piglit_init(int argc, char **argv) atexit(cleanup); if (!vk_init()) { - fprintf(stderr, "Failed to initialize Vulkan, skipping the test.\n"); + fprintf(stdout, "Failed to initialize Vulkan, skipping the test.\n"); piglit_report_result(PIGLIT_SKIP); } @@ -203,7 +203,7 @@ static bool vk_init() { if (!vk_init_ctx(&vk_core)) { - fprintf(stderr, "Failed to initialize Vulkan context.\n"); + fprintf(stdout, "Failed to initialize Vulkan context.\n"); return false; } -- 2.11.4.GIT