Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 24fdd2c8 authored by Alice Wang's avatar Alice Wang Committed by Automerger Merge Worker
Browse files

Run KeyMint VM test only when the feature is enabled am: 34e9edde 

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3482933



Change-Id: If6322a4e1e618649b49a28656cf4625576b56855
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 14f79686 34e9edde

security/rkp/aidl/vts/functional/VtsRemotelyProvisionedComponentTests.cpp

+1 −1
Original line number Diff line number Diff line
@@ -405,7 +405,7 @@ TEST(NonParameterizedTests, unlockedBootloaderStatesImpliesNonNormalRkpVmDiceCha 
 * is non-normal.

 */

TEST(NonParameterizedTests, unlockedBootloaderStatesImpliesNonNormalKeyMintInAVmDiceChain) {

    if (::android::base::GetBoolProperty("trusty.security_vm.keymint.enabled", false)) {

    if (!::android::base::GetBoolProperty("trusty.security_vm.keymint.enabled", false)) {

        GTEST_SKIP() << "The KeyMint (" << DEFAULT_INSTANCE_NAME

                     << ") instance is not inside a VM.";

    }