From cedd7edd296f20fe1200fb355fa2c71879e535a1 Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Thu, 31 Jul 2025 19:46:54 +0200 Subject: [PATCH] Cleanup: Cycles: Use gtest header instead of Blender test header To avoid conflicts with glog logging macros, and because there is just no need to have this dependency. Pull Request: https://projects.blender.org/blender/blender/pulls/143719 --- intern/cycles/test/integrator_adaptive_sampling_test.cpp | 2 +- intern/cycles/test/integrator_render_scheduler_test.cpp | 2 +- intern/cycles/test/integrator_tile_test.cpp | 2 +- intern/cycles/test/kernel_camera_projection_test.cpp | 2 +- intern/cycles/test/util_aligned_malloc_test.cpp | 2 +- intern/cycles/test/util_boundbox_test.cpp | 5 ++--- intern/cycles/test/util_float8_test.h | 3 ++- intern/cycles/test/util_ies_test.cpp | 2 +- intern/cycles/test/util_math_fast_test.cpp | 2 +- intern/cycles/test/util_math_float3_test.cpp | 4 ++-- intern/cycles/test/util_math_float4_test.cpp | 4 ++-- intern/cycles/test/util_math_test.cpp | 2 +- intern/cycles/test/util_md5_test.cpp | 2 +- intern/cycles/test/util_path_test.cpp | 2 +- intern/cycles/test/util_string_test.cpp | 2 +- intern/cycles/test/util_task_test.cpp | 2 +- intern/cycles/test/util_time_test.cpp | 2 +- intern/cycles/test/util_transform_test.cpp | 2 +- 18 files changed, 22 insertions(+), 22 deletions(-) diff --git a/intern/cycles/test/integrator_adaptive_sampling_test.cpp b/intern/cycles/test/integrator_adaptive_sampling_test.cpp index 107b882e0f0..a538e8380e3 100644 --- a/intern/cycles/test/integrator_adaptive_sampling_test.cpp +++ b/intern/cycles/test/integrator_adaptive_sampling_test.cpp @@ -2,7 +2,7 @@ * * SPDX-License-Identifier: Apache-2.0 */ -#include "testing/testing.h" +#include #include "integrator/adaptive_sampling.h" #include "util/vector.h" diff --git a/intern/cycles/test/integrator_render_scheduler_test.cpp b/intern/cycles/test/integrator_render_scheduler_test.cpp index e74a447e510..5eabce49946 100644 --- a/intern/cycles/test/integrator_render_scheduler_test.cpp +++ b/intern/cycles/test/integrator_render_scheduler_test.cpp @@ -2,7 +2,7 @@ * * SPDX-License-Identifier: Apache-2.0 */ -#include "testing/testing.h" +#include #include "integrator/render_scheduler.h" diff --git a/intern/cycles/test/integrator_tile_test.cpp b/intern/cycles/test/integrator_tile_test.cpp index 81e1f3631bc..fb375ef9d5a 100644 --- a/intern/cycles/test/integrator_tile_test.cpp +++ b/intern/cycles/test/integrator_tile_test.cpp @@ -2,7 +2,7 @@ * * SPDX-License-Identifier: Apache-2.0 */ -#include "testing/testing.h" +#include #include "integrator/tile.h" #include "util/math.h" diff --git a/intern/cycles/test/kernel_camera_projection_test.cpp b/intern/cycles/test/kernel_camera_projection_test.cpp index a8ade37b94e..576969ab60f 100644 --- a/intern/cycles/test/kernel_camera_projection_test.cpp +++ b/intern/cycles/test/kernel_camera_projection_test.cpp @@ -2,7 +2,7 @@ * * SPDX-License-Identifier: Apache-2.0 */ -#include "testing/testing.h" +#include #include "util/math.h" #include "util/types.h" diff --git a/intern/cycles/test/util_aligned_malloc_test.cpp b/intern/cycles/test/util_aligned_malloc_test.cpp index dca4d2edf45..15ede31293b 100644 --- a/intern/cycles/test/util_aligned_malloc_test.cpp +++ b/intern/cycles/test/util_aligned_malloc_test.cpp @@ -2,7 +2,7 @@ * * SPDX-License-Identifier: Apache-2.0 */ -#include "testing/testing.h" +#include #include "util/aligned_malloc.h" diff --git a/intern/cycles/test/util_boundbox_test.cpp b/intern/cycles/test/util_boundbox_test.cpp index 221d9ef65de..ef895da42be 100644 --- a/intern/cycles/test/util_boundbox_test.cpp +++ b/intern/cycles/test/util_boundbox_test.cpp @@ -2,10 +2,9 @@ * * SPDX-License-Identifier: Apache-2.0 */ +#include + #include "util/boundbox.h" - -#include "testing/testing.h" - #include "util/transform.h" CCL_NAMESPACE_BEGIN diff --git a/intern/cycles/test/util_float8_test.h b/intern/cycles/test/util_float8_test.h index fab2950d429..cd807d09ab6 100644 --- a/intern/cycles/test/util_float8_test.h +++ b/intern/cycles/test/util_float8_test.h @@ -2,7 +2,8 @@ * * SPDX-License-Identifier: Apache-2.0 */ -#include "testing/testing.h" +#include + #include "util/math.h" #include "util/system.h" #include "util/types.h" diff --git a/intern/cycles/test/util_ies_test.cpp b/intern/cycles/test/util_ies_test.cpp index e13ee11fabb..52c0a1ede2d 100644 --- a/intern/cycles/test/util_ies_test.cpp +++ b/intern/cycles/test/util_ies_test.cpp @@ -2,7 +2,7 @@ * * SPDX-License-Identifier: Apache-2.0 */ -#include "testing/testing.h" +#include #include "util/ies.h" diff --git a/intern/cycles/test/util_math_fast_test.cpp b/intern/cycles/test/util_math_fast_test.cpp index 885164a7adc..6889634ae7c 100644 --- a/intern/cycles/test/util_math_fast_test.cpp +++ b/intern/cycles/test/util_math_fast_test.cpp @@ -2,7 +2,7 @@ * * SPDX-License-Identifier: Apache-2.0 */ -#include "testing/testing.h" +#include #include "util/math.h" #include "util/math_fast.h" diff --git a/intern/cycles/test/util_math_float3_test.cpp b/intern/cycles/test/util_math_float3_test.cpp index dabac37dc0b..1e315376efb 100644 --- a/intern/cycles/test/util_math_float3_test.cpp +++ b/intern/cycles/test/util_math_float3_test.cpp @@ -5,9 +5,9 @@ /* Note: These fixtures test default micro-architecture optimization defined in the * util/optimization.h. */ -#include "testing/testing.h" +#include + #include "util/math.h" -#include "util/system.h" CCL_NAMESPACE_BEGIN diff --git a/intern/cycles/test/util_math_float4_test.cpp b/intern/cycles/test/util_math_float4_test.cpp index 6b4aa80657d..40272a625ae 100644 --- a/intern/cycles/test/util_math_float4_test.cpp +++ b/intern/cycles/test/util_math_float4_test.cpp @@ -5,9 +5,9 @@ /* Note: These fixtures test default micro-architecture optimization defined in the * util/optimization.h. */ -#include "testing/testing.h" +#include + #include "util/math.h" -#include "util/system.h" CCL_NAMESPACE_BEGIN diff --git a/intern/cycles/test/util_math_test.cpp b/intern/cycles/test/util_math_test.cpp index 63d8050573c..c446ad6c9b3 100644 --- a/intern/cycles/test/util_math_test.cpp +++ b/intern/cycles/test/util_math_test.cpp @@ -2,7 +2,7 @@ * * SPDX-License-Identifier: Apache-2.0 */ -#include "testing/testing.h" +#include #include "util/math.h" diff --git a/intern/cycles/test/util_md5_test.cpp b/intern/cycles/test/util_md5_test.cpp index da643ecab52..6c8d16636d9 100644 --- a/intern/cycles/test/util_md5_test.cpp +++ b/intern/cycles/test/util_md5_test.cpp @@ -2,7 +2,7 @@ * * SPDX-License-Identifier: Apache-2.0 */ -#include "testing/testing.h" +#include #include "util/md5.h" diff --git a/intern/cycles/test/util_path_test.cpp b/intern/cycles/test/util_path_test.cpp index 622f0bec0dc..c28289b25a0 100644 --- a/intern/cycles/test/util_path_test.cpp +++ b/intern/cycles/test/util_path_test.cpp @@ -2,7 +2,7 @@ * * SPDX-License-Identifier: Apache-2.0 */ -#include "testing/testing.h" +#include #include "util/path.h" diff --git a/intern/cycles/test/util_string_test.cpp b/intern/cycles/test/util_string_test.cpp index cb2f92ca436..bf7134f1cbb 100644 --- a/intern/cycles/test/util_string_test.cpp +++ b/intern/cycles/test/util_string_test.cpp @@ -2,7 +2,7 @@ * * SPDX-License-Identifier: Apache-2.0 */ -#include "testing/testing.h" +#include #include "util/string.h" diff --git a/intern/cycles/test/util_task_test.cpp b/intern/cycles/test/util_task_test.cpp index f1437a74b38..0f2f2813554 100644 --- a/intern/cycles/test/util_task_test.cpp +++ b/intern/cycles/test/util_task_test.cpp @@ -2,7 +2,7 @@ * * SPDX-License-Identifier: Apache-2.0 */ -#include "testing/testing.h" +#include #include "util/task.h" diff --git a/intern/cycles/test/util_time_test.cpp b/intern/cycles/test/util_time_test.cpp index 2e34a2b692f..37c7d9dc3dc 100644 --- a/intern/cycles/test/util_time_test.cpp +++ b/intern/cycles/test/util_time_test.cpp @@ -2,7 +2,7 @@ * * SPDX-License-Identifier: Apache-2.0 */ -#include "testing/testing.h" +#include #include "util/time.h" diff --git a/intern/cycles/test/util_transform_test.cpp b/intern/cycles/test/util_transform_test.cpp index e384845cf0d..359fb9b3d87 100644 --- a/intern/cycles/test/util_transform_test.cpp +++ b/intern/cycles/test/util_transform_test.cpp @@ -2,7 +2,7 @@ * * SPDX-License-Identifier: Apache-2.0 */ -#include "testing/testing.h" +#include #include "util/transform.h" #include "util/vector.h"