diff options
Diffstat (limited to 'drm')
| -rw-r--r-- | drm/1.0/vts/functional/drm_hal_clearkey_test.cpp | 3 | ||||
| -rw-r--r-- | drm/1.0/vts/functional/drm_hal_vendor_test.cpp | 10 |
2 files changed, 5 insertions, 8 deletions
diff --git a/drm/1.0/vts/functional/drm_hal_clearkey_test.cpp b/drm/1.0/vts/functional/drm_hal_clearkey_test.cpp index 04f265866..26641e895 100644 --- a/drm/1.0/vts/functional/drm_hal_clearkey_test.cpp +++ b/drm/1.0/vts/functional/drm_hal_clearkey_test.cpp @@ -16,7 +16,6 @@ #define LOG_TAG "drm_hal_clearkey_test@1.0" -#include <android-base/logging.h> #include <android/hardware/drm/1.0/ICryptoFactory.h> #include <android/hardware/drm/1.0/ICryptoPlugin.h> #include <android/hardware/drm/1.0/IDrmFactory.h> @@ -27,8 +26,8 @@ #include <hidl/HidlSupport.h> #include <hidlmemory/mapping.h> #include <log/log.h> -#include <openssl/aes.h> #include <memory> +#include <openssl/aes.h> #include <random> #include "VtsHalHidlTargetTestBase.h" 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 33fb6fbac..e651e193b 100644 --- a/drm/1.0/vts/functional/drm_hal_vendor_test.cpp +++ b/drm/1.0/vts/functional/drm_hal_vendor_test.cpp @@ -16,7 +16,6 @@ #define LOG_TAG "drm_hal_vendor_test@1.0" -#include <android-base/logging.h> #include <android/hardware/drm/1.0/ICryptoFactory.h> #include <android/hardware/drm/1.0/ICryptoPlugin.h> #include <android/hardware/drm/1.0/IDrmFactory.h> @@ -27,8 +26,8 @@ #include <gtest/gtest.h> #include <hidlmemory/mapping.h> #include <log/log.h> -#include <openssl/aes.h> #include <memory> +#include <openssl/aes.h> #include <random> #include "drm_hal_vendor_module_api.h" @@ -129,7 +128,7 @@ class DrmHalVendorFactoryTest : public testing::TestWithParam<std::string> { // Do the same for the crypto factory cryptoFactory = VtsTestBase::getService<ICryptoFactory>(name); if (cryptoFactory == nullptr) { - VtsTestBase::getService<ICryptoFactory>(); + cryptoFactory = VtsTestBase::getService<ICryptoFactory>(); } ASSERT_NE(cryptoFactory, nullptr); @@ -1598,9 +1597,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(); |