[igt-dev] tests: add missing braces around initializer

Carlos Santa carlos.santa at intel.com
Tue Jul 21 18:15:21 UTC 2020


In some sandboxes the toolchain complains about missing braces
around initializer, however, adding an extra pair of braces
fixes it, see below:

../tests/kms_plane_cursor.c: In function '__real_main_302':
../tests/kms_plane_cursor.c:305:2 error: missing braces around initializer [-Werror=missing-braces]
	data_t data = { 0 };

Signed-off-by: Carlos Santa <carlos.santa at intel.com>
---
 tests/amdgpu/amd_abm.c   | 2 +-
 tests/kms_hdr.c          | 2 +-
 tests/kms_plane_cursor.c | 2 +-
 tests/kms_vrr.c          | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/amdgpu/amd_abm.c b/tests/amdgpu/amd_abm.c
index 741564628642..398e9e6031ca 100644
--- a/tests/amdgpu/amd_abm.c
+++ b/tests/amdgpu/amd_abm.c
@@ -299,7 +299,7 @@ static void abm_gradual(data_t *data)
 
 igt_main
 {
-	data_t data = { 0 };
+	data_t data = {{ 0 }};
 	enum pipe pipe;
 	igt_output_t *output;
 
diff --git a/tests/kms_hdr.c b/tests/kms_hdr.c
index 0574d5ff5217..91f0cbfc9d16 100644
--- a/tests/kms_hdr.c
+++ b/tests/kms_hdr.c
@@ -633,7 +633,7 @@ static void test_hdr(data_t *data, const char *test_name, uint32_t flags)
 
 igt_main
 {
-	data_t data = { 0 };
+	data_t data = {{ 0 }};
 
 	igt_fixture {
 		data.fd = drm_open_driver_master(DRIVER_AMDGPU | DRIVER_INTEL);
diff --git a/tests/kms_plane_cursor.c b/tests/kms_plane_cursor.c
index f7d50484dae1..61c5c9ccf8f7 100644
--- a/tests/kms_plane_cursor.c
+++ b/tests/kms_plane_cursor.c
@@ -302,7 +302,7 @@ static void test_cursor_viewport(data_t *data, int size, enum pipe pipe_id)
 igt_main
 {
 	static const int cursor_sizes[] = { 64, 128, 256 };
-	data_t data = { 0 };
+	data_t data = {{ 0 }};
 	enum pipe pipe;
 	int i;
 
diff --git a/tests/kms_vrr.c b/tests/kms_vrr.c
index 559ef2030930..f6dc9ba31e6f 100644
--- a/tests/kms_vrr.c
+++ b/tests/kms_vrr.c
@@ -390,7 +390,7 @@ run_vrr_test(data_t *data, test_t test, uint32_t flags)
 
 igt_main
 {
-	data_t data = { 0 };
+	data_t data = {{ 0 }};
 
 	igt_fixture {
 		data.drm_fd = drm_open_driver_master(DRIVER_ANY);
-- 
2.26.2



More information about the igt-dev mailing list