Am 01.03.2018 um 11:17 schrieb Michel Dänzer: > From: Michel Dänzer <michel.daenzer at amd.com> > > Signed-off-by: Michel Dänzer <michel.daenzer at amd.com> Acked-by: Christian König <christian.koenig at amd.com> > --- > tests/amdgpu/amdgpu_test.c | 12 ++++++------ > tests/amdgpu/amdgpu_test.h | 12 ++++++------ > 2 files changed, 12 insertions(+), 12 deletions(-) > > diff --git a/tests/amdgpu/amdgpu_test.c b/tests/amdgpu/amdgpu_test.c > index 4f766aaf..f901a71d 100644 > --- a/tests/amdgpu/amdgpu_test.c > +++ b/tests/amdgpu/amdgpu_test.c > @@ -51,7 +51,7 @@ > #include "amdgpu_test.h" > #include "amdgpu_internal.h" > > -/* Test suit names */ > +/* Test suite names */ > #define BASIC_TESTS_STR "Basic Tests" > #define BO_TESTS_STR "BO Tests" > #define CS_TESTS_STR "CS Tests" > @@ -399,7 +399,7 @@ static int amdgpu_find_device(uint8_t bus, uint16_t dev) > return -1; > } > > -static void amdgpu_disable_suits() > +static void amdgpu_disable_suites() > { > amdgpu_device_handle device_handle; > uint32_t major_version, minor_version, family_id; > @@ -415,11 +415,11 @@ static void amdgpu_disable_suits() > if (amdgpu_device_deinitialize(device_handle)) > return; > > - /* Set active status for suits based on their policies */ > + /* Set active status for suites based on their policies */ > for (i = 0; i < size; ++i) > if (amdgpu_set_suite_active(suites_active_stat[i].pName, > suites_active_stat[i].pActive())) > - fprintf(stderr, "suit deactivation failed - %s\n", CU_get_error_msg()); > + fprintf(stderr, "suite deactivation failed - %s\n", CU_get_error_msg()); > > /* Explicitly disable specific tests due to known bugs or preferences */ > /* > @@ -555,8 +555,8 @@ int main(int argc, char **argv) > /* Run tests using the CUnit Basic interface */ > CU_basic_set_mode(CU_BRM_VERBOSE); > > - /* Disable suits and individual tests based on misc. conditions */ > - amdgpu_disable_suits(); > + /* Disable suites and individual tests based on misc. conditions */ > + amdgpu_disable_suites(); > > if (display_list) { > display_test_suites(); > diff --git a/tests/amdgpu/amdgpu_test.h b/tests/amdgpu/amdgpu_test.h > index 7397dea0..62875736 100644 > --- a/tests/amdgpu/amdgpu_test.h > +++ b/tests/amdgpu/amdgpu_test.h > @@ -350,26 +350,26 @@ amdgpu_get_bo_list(amdgpu_device_handle dev, amdgpu_bo_handle bo1, > } > > > -static inline CU_ErrorCode amdgpu_set_suite_active(const char *suit_name, > +static inline CU_ErrorCode amdgpu_set_suite_active(const char *suite_name, > CU_BOOL active) > { > - CU_ErrorCode r = CU_set_suite_active(CU_get_suite(suit_name), active); > + CU_ErrorCode r = CU_set_suite_active(CU_get_suite(suite_name), active); > > if (r != CUE_SUCCESS) > - fprintf(stderr, "Failed to obtain suite %s\n", suit_name); > + fprintf(stderr, "Failed to obtain suite %s\n", suite_name); > > return r; > } > > -static inline CU_ErrorCode amdgpu_set_test_active(const char *suit_name, > +static inline CU_ErrorCode amdgpu_set_test_active(const char *suite_name, > const char *test_name, CU_BOOL active) > { > CU_ErrorCode r; > - CU_pSuite pSuite = CU_get_suite(suit_name); > + CU_pSuite pSuite = CU_get_suite(suite_name); > > if (!pSuite) { > fprintf(stderr, "Failed to obtain suite %s\n", > - suit_name); > + suite_name); > return CUE_NOSUITE; > } >