pa-fazil
/
android_bionic
mirror of https://github.com/fazilsheik96/android_bionic.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge "Fix-up for change in pwd/grp ids for PRNG seeder daemon" into android13-tests-dev

This commit is contained in:
Orion Hodson 2022-10-31 07:34:05 +00:00 committed by Gerrit Code Review
parent 159a0e884f f5fd5adf04
commit d06e75b7e3
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
tests/grp_pwd_test.cpp
View File

@ -441,6 +441,17 @@ 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
#endif
ids.erase(AID_PRNG_SEEDER);
expected_ids.erase(AID_PRNG_SEEDER);
}
EXPECT_EQ(expected_ids, ids) << return_differences();
}
#endif