From aeab24aa9e074043965cf911f60a3736c4f6455d Mon Sep 17 00:00:00 2001 From: Andrey Grodzovsky Date: Mon, 27 Nov 2017 07:26:13 -0500 Subject: [PATCH] amdgpu: Dynamicly disable BO suite "Metadata" test. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Disable the test instead of doing #ifdef 0 Signed-off-by: Andrey Grodzovsky Reviewed-by: Christian König --- tests/amdgpu/amdgpu_test.c | 3 +++ tests/amdgpu/bo_tests.c | 2 -- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/tests/amdgpu/amdgpu_test.c b/tests/amdgpu/amdgpu_test.c index e611276d..50da17ca 100644 --- a/tests/amdgpu/amdgpu_test.c +++ b/tests/amdgpu/amdgpu_test.c @@ -417,6 +417,9 @@ static void amdgpu_disable_suits() */ if (amdgpu_set_test_active(DEADLOCK_TESTS_STR, "compute ring block test", CU_FALSE)) fprintf(stderr, "test deactivation failed - %s\n", CU_get_error_msg()); + + if (amdgpu_set_test_active(BO_TESTS_STR, "Metadata", CU_FALSE)) + fprintf(stderr, "test deactivation failed - %s\n", CU_get_error_msg()); } /* The main() function for setting up and running the tests. diff --git a/tests/amdgpu/bo_tests.c b/tests/amdgpu/bo_tests.c index 53e76c1b..24698bcb 100644 --- a/tests/amdgpu/bo_tests.c +++ b/tests/amdgpu/bo_tests.c @@ -51,9 +51,7 @@ static void amdgpu_mem_fail_alloc(void); CU_TestInfo bo_tests[] = { { "Export/Import", amdgpu_bo_export_import }, -#if 0 { "Metadata", amdgpu_bo_metadata }, -#endif { "CPU map/unmap", amdgpu_bo_map_unmap }, { "Memory alloc Test", amdgpu_memory_alloc }, { "Memory fail alloc Test", amdgpu_mem_fail_alloc },