Merge "Annotate logcat with current running test (oemcrypto)"

libwvdrmengine/cdm/core/src/privacy_crypto_openssl.cpp

@@ -182,7 +182,7 @@ bool RsaPublicKey::Encrypt(const std::string& clear_message,
 
 // LogOpenSSLError is a callback from OpenSSL which is called with each error
 // in the thread's error queue.
-static int LogOpenSSLError(const char *msg, size_t len, void *ctx) {
+static int LogOpenSSLError(const char *msg, size_t /* len */, void */* ctx */) {
   LOGE("  %s", msg);
   return 1;
 }

libwvdrmengine/cdm/src/log.cpp

@@ -26,9 +26,10 @@ namespace wvcdm {
 
 LogPriority g_cutoff = LOG_VERBOSE;
 
-void InitLogging(int argc, const char* const* argv) {}
+void InitLogging(int /* argc */, const char* const* /* argv */) {}
 
-void Log(const char* file, int line, LogPriority level, const char* fmt, ...) {
+void Log(const char* /* file */, int /* line */, LogPriority level,
+         const char* fmt, ...) {
   va_list ap;
   char buf[LOG_BUF_SIZE];
   va_start(ap, fmt);

libwvdrmengine/oemcrypto/test/oemcrypto_test.cpp

@@ -1458,6 +1458,10 @@ class OEMCryptoClientTest : public ::testing::Test {
     wvcdm::Properties::Init();
     ASSERT_EQ(OEMCrypto_SUCCESS, OEMCrypto_Initialize());
     wvcdm::g_cutoff = wvcdm::LOG_INFO;
+    const ::testing::TestInfo* const test_info =
+        ::testing::UnitTest::GetInstance()->current_test_info();
+    LOGD("Running test %s.%s", test_info->name(),
+         test_info->test_case_name());
   }
 
   virtual void TearDown() {