diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2020-07-13 23:08:36 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2020-07-13 23:08:36 +0000 |
| commit | 7b474833bb38af410d036b875d33b4e2911b9c37 (patch) | |
| tree | 43f5638b23709086555b94a041fe0788d21c6f65 | |
| parent | afacee21d9d0816f44d420ae4e0bac56b0ebfe2f (diff) | |
| parent | dd4282c3f16471cbffc2f14c3d156a42a642cd75 (diff) | |
Snap for 6676242 from dd4282c3f16471cbffc2f14c3d156a42a642cd75 to rvc-qpr1-release
Change-Id: I2006b1124355be658f52641c7cf313ab01828e9e
| -rw-r--r-- | tests/grp_pwd_test.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/tests/grp_pwd_test.cpp b/tests/grp_pwd_test.cpp index 9c6b0c5cb..cab717524 100644 --- a/tests/grp_pwd_test.cpp +++ b/tests/grp_pwd_test.cpp @@ -75,7 +75,11 @@ static void check_passwd(const passwd* pwd, const char* username, uid_t uid, uid EXPECT_STREQ("/", pwd->pw_dir); } - EXPECT_STREQ("/bin/sh", pwd->pw_shell); + // This has changed over time and that causes new GSI + old vendor images testing to fail. + // This parameter doesn't matter on Android, so simply ignore its value for older vendor images. + if (android::base::GetIntProperty("ro.product.first_api_level", 0) >= 30) { + EXPECT_STREQ("/bin/sh", pwd->pw_shell); + } } static void check_getpwuid(const char* username, uid_t uid, uid_type_t uid_type, |