tequilaOS/platform_bionic
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Merge "grp_pwd_test: Hack around "trunk stable"." into android14-tests-dev am: 40f12b4aa6" into main

Browse source
This commit is contained in:
Automerger Merge Worker 2024-02-21 23:00:36 +00:00 committed by Gerrit Code Review
commit bf0dcc4367
1 changed files with 25 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
tests/grp_pwd_test.cpp
View file

@ -444,16 +444,33 @@ static void expect_ids(T ids, bool is_group) {
return result;
};
// AID_PRNG_SEEDER (1092) was added in TM-QPR2, but CTS is shared
// across Android 13 versions so we may or may not find it in this
// test (b/253185870).
if (android::base::GetIntProperty("ro.build.version.sdk", 0) == __ANDROID_API_T__) {
#ifndef AID_PRNG_SEEDER
#define AID_PRNG_SEEDER 1092
// AID_UPROBESTATS (1093) was added in V, but "trunk stable" means
// that the 2024Q builds don't have branches like the QPR builds used
// to, and are tested with the _previous_ release's CTS.
if (android::base::GetIntProperty("ro.build.version.sdk", 0) == __ANDROID_API_U__) {
#if !defined(AID_UPROBESTATS)
#define AID_UPROBESTATS 1093
#endif
ids.erase(AID_PRNG_SEEDER);
expected_ids.erase(AID_PRNG_SEEDER);
ids.erase(AID_UPROBESTATS);
expected_ids.erase(AID_UPROBESTATS);
if (getpwuid(AID_UPROBESTATS)) {
EXPECT_STREQ(getpwuid(AID_UPROBESTATS)->pw_name, "uprobestats");
}
}
// AID_VIRTUALMACHINE (3013) was added in V, but "trunk stable" means
// that the 2024Q builds don't have branches like the QPR builds used
// to, and are tested with the _previous_ release's CTS.
if (android::base::GetIntProperty("ro.build.version.sdk", 0) == __ANDROID_API_U__) {
#if !defined(AID_VIRTUALMACHINE)
#define AID_VIRTUALMACHINE 3013
#endif
ids.erase(AID_VIRTUALMACHINE);
expected_ids.erase(AID_VIRTUALMACHINE);
if (getpwuid(AID_VIRTUALMACHINE)) {
EXPECT_STREQ(getpwuid(AID_VIRTUALMACHINE)->pw_name, "virtualmachine");
}
}
EXPECT_EQ(expected_ids, ids) << return_differences();
}
#endif