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

Commit 576b1be2 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge changes I2b0fcb8d,I72510d61 into main 

* changes:
  init_kill_services_test: += system_suspend
  init_kill_services_test: formatting for merges
parents fe4f5a1e 164f2970

init/test_kill_services/init_kill_services_test.cpp

+22 −3
Original line number Diff line number Diff line
@@ -87,6 +87,25 @@ static inline std::string PrintName(const testing::TestParamInfo<std::string>& i 
    return info.param;

}



INSTANTIATE_TEST_CASE_P(DeathTest, InitKillServicesTest,

                        ::testing::Values("lmkd", "ueventd", "hwservicemanager", "servicemanager"),

INSTANTIATE_TEST_CASE_P(

        DeathTest, InitKillServicesTest,

        ::testing::Values(

                // clang-format off



// TODO: we may want a more automatic way of testing this for services based on some

// criteria (e.g. not disabled), but for now adding core services one at a time



// BEGIN INTERNAL ONLY MERGE GUARD (add things here if internal only, move down later)

// END INTERNAL ONLY MERGE GUARD



// BEGIN AOSP ONLY (add things here if adding to AOSP)

    "lmkd",

    "ueventd",

    "hwservicemanager",

    "servicemanager",

    "system_suspend"

// END AOSP ONLY



                // clang-format on

                ),

        PrintName);