From a745387c20dfdd2793d0b5f7b4c136b169af4c83 Mon Sep 17 00:00:00 2001
From: Fred Gylys-Colwell <fredgc@google.com>
Date: Fri, 17 Apr 2015 12:50:32 -0700
Subject: [PATCH] Annotate logcat with current running test (oemcrypto)

Merge from widevine repo of http://go/wvgerrit/14125

This copies code from http://go/wvgerrit/13847 to the oemcrypto unit
tests.  It puts the test name in the log file.

I also commented out some unused function parameters to avoid compiler
warnings.

Change-Id: I3ba259de2f408ec60e90db7f0ea1524d5aa8f8a4
---
 libwvdrmengine/cdm/core/src/privacy_crypto_openssl.cpp | 2 +-
 libwvdrmengine/cdm/src/log.cpp                         | 5 +++--
 libwvdrmengine/oemcrypto/test/oemcrypto_test.cpp       | 4 ++++
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/libwvdrmengine/cdm/core/src/privacy_crypto_openssl.cpp b/libwvdrmengine/cdm/core/src/privacy_crypto_openssl.cpp
index 9425e593..2d304e27 100644
--- a/libwvdrmengine/cdm/core/src/privacy_crypto_openssl.cpp
+++ b/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;
 }
diff --git a/libwvdrmengine/cdm/src/log.cpp b/libwvdrmengine/cdm/src/log.cpp
index ca45838e..bc631d93 100644
--- a/libwvdrmengine/cdm/src/log.cpp
+++ b/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);
diff --git a/libwvdrmengine/oemcrypto/test/oemcrypto_test.cpp b/libwvdrmengine/oemcrypto/test/oemcrypto_test.cpp
index dea8db3c..b28fd272 100644
--- a/libwvdrmengine/oemcrypto/test/oemcrypto_test.cpp
+++ b/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() {