commit a538a0711e2de069f1f7d5524e3351fd0edd5089
author Jeff Tinker <jtinker@google.com> Fri Aug 18 04:07:03 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri Aug 18 04:07:03 2017 +0000
tree 59444d2c7d0188edecaa5519148ecf6767012277
parent 1ddd9691b5e14d63282f29a320e83eb58640ec05
parent 5db2e67293fa53d392804f84a9981b3a548e0ac9

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

Change-Id: I4507467925abf52954535df5a50ae7494f6b4bac

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 5d4e7d0..1be362a 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 @@
 #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();