diff options
| author | George Zacharia <george.zcharia@gmail.com> | 2023-08-02 07:14:58 +0530 |
|---|---|---|
| committer | George Zacharia <george.zcharia@gmail.com> | 2023-08-02 07:14:58 +0530 |
| commit | 37897a48337da83e36a5244f5241a2bdfd257e1d (patch) | |
| tree | 6ddb0527cf33db0fa9964d4c2756c9fe7d5bf496 /tests/grp_pwd_test.cpp | |
| parent | 43ecd869bdcf14fa9fb2297f822c25ebb4025ccd (diff) | |
| parent | e2b2fd5475b5da5866e481bd5b72ef4333032792 (diff) | |
Merge tag 'android-13.0.0_r52' of https://android.googlesource.com/platform/bionic into t13.0HEADt13.0
Android 13.0.0 Release 52 (TQ3A.230605.012)
Change-Id: Ic18bc3dfc28e9e23f5a96e2e74843d9e27dbe141
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 |