From 0f89539de6df6ebe991ae29510e55867317389c0 Mon Sep 17 00:00:00 2001 From: Derek Sollenberger Date: Thu, 27 Apr 2017 11:30:20 -0400 Subject: [PATCH] Disable Vulkan backend when running hwui_unit_tests. The Vulkan backend fails to run on devices without vulkan drivers. Until we can stub out the vulkan drivers for those devices we find an acceptable solution. Test: hwui_unit_tests on device w/out vulkan Bug: 37422708 Change-Id: I3d7c21882053459f25ca1eb5648cdf5dfd4c333e --- libs/hwui/tests/common/TestUtils.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/libs/hwui/tests/common/TestUtils.h b/libs/hwui/tests/common/TestUtils.h index 0c7bb6079fea3..dd457867ea420 100644 --- a/libs/hwui/tests/common/TestUtils.h +++ b/libs/hwui/tests/common/TestUtils.h @@ -88,7 +88,8 @@ namespace uirenderer { }; \ INNER_PIPELINE_RENDERTHREAD_TEST(test_case_name, test_name, OpenGL); \ INNER_PIPELINE_RENDERTHREAD_TEST(test_case_name, test_name, SkiaGL); \ - INNER_PIPELINE_RENDERTHREAD_TEST(test_case_name, test_name, SkiaVulkan); \ + /* Temporarily disabling Vulkan until we can figure out a way to stub out the driver */ \ + /* INNER_PIPELINE_RENDERTHREAD_TEST(test_case_name, test_name, SkiaVulkan); */ \ void test_case_name##_##test_name##_RenderThreadTest::doTheThing(renderthread::RenderThread& renderThread) /** @@ -111,7 +112,8 @@ namespace uirenderer { static void doTheThing(renderthread::RenderThread& renderThread); \ }; \ INNER_PIPELINE_RENDERTHREAD_TEST(test_case_name, test_name, SkiaGL); \ - INNER_PIPELINE_RENDERTHREAD_TEST(test_case_name, test_name, SkiaVulkan); \ + /* Temporarily disabling Vulkan until we can figure out a way to stub out the driver */ \ + /* INNER_PIPELINE_RENDERTHREAD_TEST(test_case_name, test_name, SkiaVulkan); */ \ void test_case_name##_##test_name##_RenderThreadTest::doTheThing(renderthread::RenderThread& renderThread) /**