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

Use GTEST_SKIP to skip prov40 tests

Browse Source 
Merge from Widevine repo of http://go/wvgerrit/169076

We want to transition to using GTEST_SKIP to skip unit tests instead of
modifying the GTEST_FILTER variable. This does so for provisioning 4.0
tests.

Bug: 251240681
Merged from https://widevine-internal-review.googlesource.com/167497

Change-Id: I65a879fba24b199bd115980bdd556c123fcc1cdc
This commit is contained in:
Vicky Min
2023-03-27 19:41:56 -07:00
committed by Fred Gylys-Colwell
parent 6c834acc50
commit 225a3e50ed
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libwvdrmengine/oemcrypto/test/oec_device_features.cpp
View File

@@ -162,8 +162,6 @@ std::string DeviceFeatures::RestrictFilter(const std::string& initial_filter) {
if (!generic_crypto) FilterOut(&filter, "*GenericCrypto*"); if (!generic_crypto) FilterOut(&filter, "*GenericCrypto*");
if (!supports_cas) FilterOut(&filter, "*CasOnly*"); if (!supports_cas) FilterOut(&filter, "*CasOnly*");
if (derive_key_method == NO_METHOD) FilterOut(&filter, "*SessionTest*"); if (derive_key_method == NO_METHOD) FilterOut(&filter, "*SessionTest*");
if (provisioning_method != OEMCrypto_BootCertificateChain)
FilterOut(&filter, "*Prov40*");
if (!supports_rsa_3072) FilterOut(&filter, "*RSAKey3072*"); if (!supports_rsa_3072) FilterOut(&filter, "*RSAKey3072*");
if (api_version < 17) FilterOut(&filter, "*API17*"); if (api_version < 17) FilterOut(&filter, "*API17*");
if (api_version < 18) FilterOut(&filter, "*API18*"); if (api_version < 18) FilterOut(&filter, "*API18*");

9
libwvdrmengine/oemcrypto/test/oemcrypto_provisioning_test.h
View File

@@ -45,7 +45,14 @@ class OEMCryptoProv30Test : public OEMCryptoClientTest {
}; };
// This class is for tests that have boot certificate chain instead of a keybox. // This class is for tests that have boot certificate chain instead of a keybox.
class OEMCryptoProv40Test : public OEMCryptoClientTest {}; class OEMCryptoProv40Test : public OEMCryptoClientTest {
void SetUp() override {
OEMCryptoClientTest::SetUp();
if (global_features.provisioning_method != OEMCrypto_BootCertificateChain) {
GTEST_SKIP() << "Test for Prov 4.0 devices only.";
}
}
};
// //
// Certificate Root of Trust Tests // Certificate Root of Trust Tests