| commit | 40457eab8228cee11efb645e9ebbf401994143b0 | [log] [tgz] |
|---|---|---|
| author | Hung Nguyen <hungmn@google.com> | Mon Nov 11 11:27:23 2024 -0800 |
| committer | Android Build Cherrypicker Worker <android-build-cherrypicker-worker@google.com> | Mon Dec 02 21:46:30 2024 +0000 |
| tree | 1ee9ac1bc476bb475d4cf74b20707ff5cd7fb75b | |
| parent | 09bfe337aad7170daf16ff99c02a8c1d1d762b29 [diff] |
Add mmd AID to grp_pwd_test Bug: 370509309 Bug: 375432464 Test: atest bionic-unit-tests (cherry picked from https://android-review.googlesource.com/q/commit:08fc8bd5253edf6cb3084f7f506e63d2f8931fd3) Merged-In: I3524c95f20bee565d1f5ec94468b62e625aa1776 Change-Id: I3524c95f20bee565d1f5ec94468b62e625aa1776
diff --git a/tests/grp_pwd_test.cpp b/tests/grp_pwd_test.cpp index 7b7e0e5..3f93c8a 100644 --- a/tests/grp_pwd_test.cpp +++ b/tests/grp_pwd_test.cpp
@@ -480,6 +480,18 @@ EXPECT_STREQ(getpwuid(AID_CROS_EC)->pw_name, "cros_ec"); } } + // AID_MMD (1095) was added in API level 36, but "trunk stable" means + // that the 2024Q* builds are tested with the _previous_ release's CTS. + if (android::base::GetIntProperty("ro.build.version.sdk", 0) == 35) { +#if !defined(AID_MMD) +#define AID_MMD 1095 +#endif + ids.erase(AID_MMD); + expected_ids.erase(AID_MMD); + if (getpwuid(AID_MMD)) { + EXPECT_STREQ(getpwuid(AID_MMD)->pw_name, "mmd"); + } + } EXPECT_EQ(expected_ids, ids) << return_differences(); }