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

Commit 41d2cac7 authored by David Anderson's avatar David Anderson Committed by Automerger Merge Worker
Browse files

Merge "Add a VTS test for Virtual A/B." am: 692c6d0f 

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1991381

Change-Id: Ibc67321cd3c0154c35f3abcb80dc29c30e525bf4
parents d635f15d 692c6d0f

fs_mgr/libsnapshot/Android.bp

+18 −0
Original line number Diff line number Diff line
@@ -275,6 +275,24 @@ sh_test { 
    ],

}



cc_test {

    name: "vts_ota_config_test",

    srcs: [

        "vts_ota_config_test.cpp",

    ],

    shared_libs: [

        "libbase",

    ],

    test_suites: [

        "vts",

    ],

    test_options: {

        min_shipping_api_level: 33,

    },

    auto_gen_config: true,

    require_root: true,

}



cc_binary {

    name: "snapshotctl",

    srcs: [

fs_mgr/libsnapshot/snapshot_test.cpp

+0 −2
Original line number Diff line number Diff line
@@ -46,8 +46,6 @@ 
#include "partition_cow_creator.h"

#include "utility.h"



#include <android-base/properties.h>



// Mock classes are not used. Header included to ensure mocked class definition aligns with the

// class itself.

#include <libsnapshot/mock_device_info.h>

fs_mgr/libsnapshot/vts_ota_config_test.cpp

0 → 100644
+23 −0
Original line number Diff line number Diff line 
//

// Copyright (C) 2022 The Android Open Source Project

//

// Licensed under the Apache License, Version 2.0 (the "License");

// you may not use this file except in compliance with the License.

// You may obtain a copy of the License at

//

//      http://www.apache.org/licenses/LICENSE-2.0

//

// Unless required by applicable law or agreed to in writing, software

// distributed under the License is distributed on an "AS IS" BASIS,

// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

// See the License for the specific language governing permissions and

// limitations under the License.

//



#include <android-base/properties.h>

#include <gtest/gtest.h>



TEST(VAB, Enabled) {

    ASSERT_TRUE(android::base::GetBoolProperty("ro.virtual_ab.enabled", false));

    ASSERT_TRUE(android::base::GetBoolProperty("ro.virtual_ab.userspace.snapshots.enabled", false));

}