diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2023-06-23 00:40:40 -0700 |
|---|---|---|
| committer | Linux Build Service Account <lnxbuild@localhost> | 2023-06-23 00:40:40 -0700 |
| commit | 1b298f78b67fad84f00aefec3d8f04a9b6c53ab5 (patch) | |
| tree | d9006ac00ea95c86be208575ee29d4ea6978abc1 /tests/grp_pwd_test.cpp | |
| parent | 6b3432c3ed7d0221db33011a21ff53aa2ea22da1 (diff) | |
| parent | d1d65eae22ae4dbb2c0bfb8427d8223a8e9fc6a7 (diff) | |
Merge d1d65eae22ae4dbb2c0bfb8427d8223a8e9fc6a7 on remote branch
Change-Id: I097b2175df34867bd7c8281ec8f96ef21588d64d
Diffstat (limited to 'tests/grp_pwd_test.cpp')
| -rw-r--r-- | tests/grp_pwd_test.cpp | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/tests/grp_pwd_test.cpp b/tests/grp_pwd_test.cpp index bf65720f9..65a54a659 100644 --- a/tests/grp_pwd_test.cpp +++ b/tests/grp_pwd_test.cpp @@ -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 |