From f1f88f529e7d5e65bbe133a182abd001eb967b56 Mon Sep 17 00:00:00 2001 From: Fred Gylys-Colwell Date: Wed, 28 Feb 2018 15:27:14 -0800 Subject: [PATCH] Disable v14 unit test for Pi Merge from Widevine repo of http://go/wvgerrit/44502 OEMCrypto v14 is no longer required for Pi, so this CL disables the unit test verifying that version. The test will be re-enabled for MR1. test: unit tests bug: 74003607 Change-Id: I76f9b66e1652ffb1f8a5bfc7be572e3c7a4cff83 --- libwvdrmengine/oemcrypto/test/oemcrypto_test_android.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/libwvdrmengine/oemcrypto/test/oemcrypto_test_android.cpp b/libwvdrmengine/oemcrypto/test/oemcrypto_test_android.cpp index 6ccff632..6eaf5025 100644 --- a/libwvdrmengine/oemcrypto/test/oemcrypto_test_android.cpp +++ b/libwvdrmengine/oemcrypto/test/oemcrypto_test_android.cpp @@ -140,12 +140,14 @@ TEST_F(OEMCryptoAndroidOCTest, MinVersionNumber13) { ASSERT_GE(version, 13u); } -// These tests are required for Pi Android devices. -class OEMCryptoAndroidPiTest : public OEMCryptoAndroidOCTest {}; +#if 0 // TODO(b/64001862) +// These tests are required for Pi MR1 Android devices. +class OEMCryptoAndroidPiMR1Test : public OEMCryptoAndroidOCTest {}; -TEST_F(OEMCryptoAndroidPiTest, MinVersionNumber14) { +TEST_F(OEMCryptoAndroidPiMR1Test, MinVersionNumber14) { uint32_t version = OEMCrypto_APIVersion(); ASSERT_GE(version, 14u); } +#endif } // namespace wvoec