From 5db2e67293fa53d392804f84a9981b3a548e0ac9 Mon Sep 17 00:00:00 2001 From: Jeff Tinker Date: Thu, 17 Aug 2017 10:09:32 -0700 Subject: [PATCH] Allow clearkey tests to run if no vendor modules DRM cannot skip all tests when vendor modules are not present. Currently even the clearkey tests are skipping when there is no vendor lib. This can be replicated by just pushing the DRM VTS test binary build from master (or DR or MR) and executing the binary without VTS. All test cases skip (including clearkey). This change prevents exiting when no vendor modules are found. Test: Push the test binary and confirm that the clearkey tests run. bug:64459011 Change-Id: Ic5f554d9b223d6ca4bf26f92f072254cc18f4620 --- drm/1.0/vts/functional/drm_hal_vendor_test.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drm/1.0/vts/functional/drm_hal_vendor_test.cpp b/drm/1.0/vts/functional/drm_hal_vendor_test.cpp index 5d4e7d07c3..1be362a026 100644 --- a/drm/1.0/vts/functional/drm_hal_vendor_test.cpp +++ b/drm/1.0/vts/functional/drm_hal_vendor_test.cpp @@ -1598,9 +1598,8 @@ int main(int argc, char** argv) { #endif gVendorModules = new drm_vts::VendorModules(kModulePath); if (gVendorModules->getPathList().size() == 0) { - std::cerr << "No vendor modules found in " << kModulePath << - ", exiting" << std::endl; - exit(-1); + std::cerr << "WARNING: No vendor modules found in " << kModulePath << + ", all vendor tests will be skipped" << std::endl; } ::testing::InitGoogleTest(&argc, argv); return RUN_ALL_TESTS();