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

Snap for 4565898 from 80a70c2dfb to pi-release

Browse Source 
Change-Id: I7a89f0d5668acc6acf141b228763c3731263a0df
This commit is contained in:
android-build-team Robot
2018-01-25 09:06:58 +00:00
parent 06a3903be9 80a70c2dfb
commit 7097958e1f
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libwvdrmengine/cdm/test/request_license_test.cpp
View File

@@ -2501,7 +2501,9 @@ TEST_P(WvCdmUsageTest, WithClientId) {
CdmUsageInfoReleaseMessage release_msg; CdmUsageInfoReleaseMessage release_msg;
CdmResponseType status = decryptor_.GetUsageInfo( CdmResponseType status = decryptor_.GetUsageInfo(
app_id, kDefaultCdmIdentifier, &usage_info); app_id, kDefaultCdmIdentifier, &usage_info);
EXPECT_EQ(usage_info.empty() ? NO_ERROR : KEY_MESSAGE, status);
EXPECT_EQ(KEY_MESSAGE, status);
ASSERT_FALSE(usage_info.empty());
// Validate signed renewal request // Validate signed renewal request
EXPECT_TRUE(signed_message.ParseFromString(usage_info[0])) EXPECT_TRUE(signed_message.ParseFromString(usage_info[0]))

2
libwvdrmengine/run_all_unit_tests.sh
View File

@@ -26,7 +26,7 @@ adb_shell_run() {
echo "or begin execution by running ./build_and_run_all_unit_tests.sh" echo "or begin execution by running ./build_and_run_all_unit_tests.sh"
exit 1 exit 1
fi fi
echo $test_file echo "------ Starting: $test_file"
local tmp_log="$OUT/mediadrmtest.log" local tmp_log="$OUT/mediadrmtest.log"
local adb_error="[ADB SHELL] $@ $test_file failed" local adb_error="[ADB SHELL] $@ $test_file failed"
adb shell "GTEST_FILTER=$GTEST_FILTER $@ $test_file" \|\| echo "$adb_error" | tee "$tmp_log" adb shell "GTEST_FILTER=$GTEST_FILTER $@ $test_file" \|\| echo "$adb_error" | tee "$tmp_log"