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

Merge "Merge "Fix-up for change in pwd/grp ids for PRNG seeder daemon" into android13-tests-dev am: d06e75b7e3" am: 5ac1ad606a

Browse source 
Original change: https://android-review.googlesource.com/c/platform/bionic/+/2273426

Change-Id: Ib38b1a43cf470ac7882f22ca9a209b49eed44695
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Automerger Merge Worker 2022-10-31 08:52:20 +00:00
commit 72b7c44e8a
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