Merge "Add mmd AID to grp_pwd_test" into main am: 30a1a29ba2
Original change: https://android-review.googlesource.com/c/platform/bionic/+/3341406
Change-Id: I01f8c8a3df262f946775461b67fecdbf9a47be72
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
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();
}