ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "libsnapshot: don't kill the daemon for legacy vab snapshots" into main

Browse source
This commit is contained in:
Akilesh Kailash 2024-03-28 02:36:16 +00:00 • committed by Gerrit Code Review
commit f56c861eac
2 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
fs_mgr/TEST_MAPPING
View file

@ -25,8 +25,6 @@
{
"name": "vab_legacy_tests"
},
// TODO(b/279009697):
//{"name": "vabc_legacy_tests"},
{
"name": "cow_api_test"
},
@ -44,8 +42,6 @@
{
"name": "vab_legacy_tests"
},
// TODO(b/279009697):
//{"name": "vabc_legacy_tests"}
{
"name": "snapuserd_test"
}

18
fs_mgr/libsnapshot/snapshot_test.cpp
View file

@ -2883,7 +2883,16 @@ int main(int argc, char** argv) {
::testing::AddGlobalTestEnvironment(new ::android::snapshot::SnapshotTestEnvironment());
gflags::ParseCommandLineFlags(&argc, &argv, false);
android::base::SetProperty("ctl.stop", "snapuserd");
bool vab_legacy = false;
if (FLAGS_force_mode == "vab-legacy") {
vab_legacy = true;
}
if (!vab_legacy) {
// This is necessary if the configuration we're testing doesn't match the device.
android::base::SetProperty("ctl.stop", "snapuserd");
android::snapshot::KillSnapuserd();
}
std::unordered_set<std::string> modes = {"", "vab-legacy"};
if (modes.count(FLAGS_force_mode) == 0) {
@ -2891,13 +2900,12 @@ int main(int argc, char** argv) {
return 1;
}
// This is necessary if the configuration we're testing doesn't match the device.
android::snapshot::KillSnapuserd();
int ret = RUN_ALL_TESTS();
android::base::SetProperty("snapuserd.test.io_uring.force_disable", "0");
android::snapshot::KillSnapuserd();
if (!vab_legacy) {
android::snapshot::KillSnapuserd();
}
return ret;
}