diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2020-07-14 01:08:01 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2020-07-14 01:08:01 +0000 |
| commit | f364b7ba45a4dc05c24b30f74b5e4561d5d20fec (patch) | |
| tree | 43f5638b23709086555b94a041fe0788d21c6f65 | |
| parent | ea98341b5049806d56cf4a9c89b560c6f1dd3da6 (diff) | |
| parent | 4785c135498ee01e3799f4c88369560cec252c17 (diff) | |
| download | bionic-f364b7ba45a4dc05c24b30f74b5e4561d5d20fec.tar.gz | |
Snap for 6676900 from 4785c135498ee01e3799f4c88369560cec252c17 to rvc-release
Change-Id: I7786aeba3baeda131d69be0dce9abd31effeb994
| -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, |