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

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

Merge "snapuserd: Add snapuserd_test to presubmit and VTS." into main am:... 

Merge "snapuserd: Add snapuserd_test to presubmit and VTS." into main am: 5b91ae9f am: b8cf4b82 am: a3e13cff am: e88f53fa

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



Change-Id: I1f39cb0d959219ad508b625c493f2199936d092d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b0013da8 e88f53fa

fs_mgr/TEST_MAPPING

+7 −1
Original line number Diff line number Diff line
@@ -28,6 +28,9 @@ 
    //{"name": "vabc_legacy_tests"},

    {

      "name": "cow_api_test"

    },

    {

      "name": "snapuserd_test"

    }

  ],

  "kernel-presubmit": [
@@ -42,8 +45,11 @@ 
    },

    {

      "name": "vab_legacy_tests"

    }

    },

    // TODO: b/279009697

    //{"name": "vabc_legacy_tests"}

    {

      "name": "snapuserd_test"

    }

  ]

}

fs_mgr/libsnapshot/snapuserd/Android.bp

+22 −3
Original line number Diff line number Diff line
@@ -214,8 +214,8 @@ cc_test { 
    require_root: false,

}



cc_test {

    name: "snapuserd_test",

cc_defaults {

    name: "snapuserd_test_defaults",

    defaults: [

        "fs_mgr_defaults",

        "libsnapshot_cow_defaults",
@@ -256,5 +256,24 @@ cc_test { 
        min_shipping_api_level: 30,

    },

    auto_gen_config: true,

    require_root: false,

    require_root: true,

    compile_multilib: "first",

}



cc_test {

    name: "snapuserd_test",

    defaults: ["snapuserd_test_defaults"],

    host_supported: true,

    test_suites: [

        "device-tests",

    ],

}



// vts tests cannot be host_supported.

cc_test {

    name: "vts_snapuserd_test",

    defaults: ["snapuserd_test_defaults"],

    test_suites: [

        "vts",

    ],

}