From a155742b4180e1539b1bc1225529e500c493612d Mon Sep 17 00:00:00 2001 From: Vicky Min Date: Thu, 24 Aug 2023 20:33:32 +0000 Subject: [PATCH] Skip Android tests after initialization Merged from go/wvgerrit/183552 Bug: 297123471 Test: OEMCryptoAndroidLMPTest Change-Id: I708c285db77616c3060c3a49474cb6b7cd8da6af --- libwvdrmengine/oemcrypto/test/oemcrypto_test_android.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libwvdrmengine/oemcrypto/test/oemcrypto_test_android.cpp b/libwvdrmengine/oemcrypto/test/oemcrypto_test_android.cpp index 074eb4b6..f0597ac2 100644 --- a/libwvdrmengine/oemcrypto/test/oemcrypto_test_android.cpp +++ b/libwvdrmengine/oemcrypto/test/oemcrypto_test_android.cpp @@ -25,11 +25,11 @@ namespace wvoec { class OEMCryptoAndroidLMPTest : public ::testing::Test { protected: void SetUp() override { + OEMCrypto_SetSandbox(kTestSandbox, sizeof(kTestSandbox)); + ASSERT_EQ(OEMCrypto_SUCCESS, OEMCrypto_Initialize()); if (OEMCrypto_GetProvisioningMethod() == OEMCrypto_BootCertificateChain) { GTEST_SKIP() << "Test for non Prov 4.0 devices only."; } - OEMCrypto_SetSandbox(kTestSandbox, sizeof(kTestSandbox)); - ASSERT_EQ(OEMCrypto_SUCCESS, OEMCrypto_Initialize()); OEMCrypto_SetMaxAPIVersion(kCurrentAPI); OEMCrypto_EnterTestMode(); }