commit 37ff1bf5df57b61a96f9bcfae80bc4c78fe6c6e0
author Jeff Tinker <jtinker@google.com> Fri Aug 18 04:13:04 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri Aug 18 04:13:04 2017 +0000
tree 1304ef46554708cad4a40d7766f8bcef99532ce9
parent c95c29330069552110c7ac34e21413834a4522b2
parent 66812dc3641b29bad1c8ba492f1e1cef2823cbde

Allow clearkey tests to run if no vendor modules am: 5db2e67293
am: 66812dc364

Change-Id: I577902d8653385c67cb41fdf35e62733e1636e6d

drm/1.0/vts/functional/drm_hal_vendor_test.cpp

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 67b2c7d..e651e19 100644
--- a/drm/1.0/vts/functional/drm_hal_vendor_test.cpp
+++ b/drm/1.0/vts/functional/drm_hal_vendor_test.cpp
@@ -1597,9 +1597,8 @@
 #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();