commit 66812dc3641b29bad1c8ba492f1e1cef2823cbde
author Jeff Tinker <jtinker@google.com> Fri Aug 18 04:07:04 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri Aug 18 04:07:04 2017 +0000
tree d156457669d27cd3c0afb6e6c567f4c1a2153579
parent 92d3bc1e1ad81c3cb550a5086888eb31350b1728
parent 5db2e67293fa53d392804f84a9981b3a548e0ac9

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

Change-Id: I594b8b5e9857d4a6c19d0847acf7c13949e13614

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();