widevine-partner/android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Fred Gylys-Colwell
2015-04-22 17:34:53 +00:00
committed by Android (Google) Code Review
parent 39a86c688a a745387c20
commit d6da9518ec
3 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libwvdrmengine/cdm/core/src/privacy_crypto_openssl.cpp
View File

@@ -182,7 +182,7 @@ bool RsaPublicKey::Encrypt(const std::string& clear_message,
// LogOpenSSLError is a callback from OpenSSL which is called with each error // LogOpenSSLError is a callback from OpenSSL which is called with each error
// in the thread's error queue. // 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); LOGE(" %s", msg);
return 1; return 1;
} }

5
libwvdrmengine/cdm/src/log.cpp
View File

@@ -26,9 +26,10 @@ namespace wvcdm {
LogPriority g_cutoff = LOG_VERBOSE; 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; va_list ap;
char buf[LOG_BUF_SIZE]; char buf[LOG_BUF_SIZE];
va_start(ap, fmt); va_start(ap, fmt);

4
libwvdrmengine/oemcrypto/test/oemcrypto_test.cpp
View File

@@ -1458,6 +1458,10 @@ class OEMCryptoClientTest : public ::testing::Test {
wvcdm::Properties::Init(); wvcdm::Properties::Init();
ASSERT_EQ(OEMCrypto_SUCCESS, OEMCrypto_Initialize()); ASSERT_EQ(OEMCrypto_SUCCESS, OEMCrypto_Initialize());
wvcdm::g_cutoff = wvcdm::LOG_INFO; 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() { virtual void TearDown() {