commit 8813c2b43f09d412e48ec9c3d17f8cee9c94eb0d
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 69dcb73b9a5f8b9c896c1ac3996e37f358bdf95f
parent 05973811115159393cd7f3a2af25e06aaeb142d4
parent 66812dc3641b29bad1c8ba492f1e1cef2823cbde

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

Change-Id: I6369dd486c35c842c1d0f1f151b3b468ef94ab4c

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 61f3014..47c6950 100644
--- a/drm/1.0/vts/functional/drm_hal_vendor_test.cpp
+++ b/drm/1.0/vts/functional/drm_hal_vendor_test.cpp
@@ -1595,9 +1595,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();