In the latest version of CUnit the fourth parameter of the CU_SuiteInfo
struct is pSetUpFunc rather than *pTests.
Seems like the CUnit ABI broke at some point, so let's the the robust
thing and use c99 designated initializers to correctly populate the
struct(s).
Cc: Alex Deucher <alexander.deucher at amd.com>
Cc: Leo Liu <leo.liu at amd.com>
Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>
---
tests/amdgpu/amdgpu_test.c | 32 ++++++++++++++++++++++++--------
1 file changed, 24 insertions(+), 8 deletions(-)
diff --git a/tests/amdgpu/amdgpu_test.c b/tests/amdgpu/amdgpu_test.c
index 6568990..71f357c 100644
--- a/tests/amdgpu/amdgpu_test.c
+++ b/tests/amdgpu/amdgpu_test.c
@@ -58,14 +58,30 @@ int drm_amdgpu[MAX_CARDS_SUPPORTED];
/** The table of all known test suites to run */
static CU_SuiteInfo suites[] = {
- { "Basic Tests", suite_basic_tests_init,
- suite_basic_tests_clean, basic_tests },
- { "BO Tests", suite_bo_tests_init,
- suite_bo_tests_clean, bo_tests },
- { "CS Tests", suite_cs_tests_init,
- suite_cs_tests_clean, cs_tests },
- { "VCE Tests", suite_vce_tests_init,
- suite_vce_tests_clean, vce_tests },
+ {
+ .pName = "Basic Tests",
+ .pInitFunc = suite_basic_tests_init,
+ .pCleanupFunc = suite_basic_tests_clean,
+ .pTests = basic_tests,
+ },
+ {
+ .pName = "BO Tests",
+ .pInitFunc = suite_bo_tests_init,
+ .pCleanupFunc = suite_bo_tests_clean,
+ .pTests = bo_tests,
+ },
+ {
+ .pName = "CS Tests",
+ .pInitFunc = suite_cs_tests_init,
+ .pCleanupFunc = suite_cs_tests_clean,
+ .pTests = cs_tests,
+ },
+ {
+ .pName = "VCE Tests",
+ .pInitFunc = suite_vce_tests_init,
+ .pCleanupFunc = suite_vce_tests_clean,
+ .pTests = vce_tests,
+ },
CU_SUITE_INFO_NULL,
};
--
2.5.0
