| commit | 552f46aed757c639cd491f14bec8f69dfd59ac73 | [log] [tgz] |
|---|---|---|
| author | Boleyn Su <boleynsu@google.com> | Fri Jun 26 18:08:07 2020 +0900 |
| committer | Boleyn Su <boleynsu@google.com> | Mon Jun 29 09:00:10 2020 +0000 |
| tree | 342692101c87681982c51b0e88a8c5032aada322 | |
| parent | aa56138cd0dfac271d466ff2a90dc2f0f4afac22 [diff] |
ReadFileSymbolicLink checks /system/bin/ps According to https://android.googlesource.com/platform/build/+/refs/heads/android10-dev/core/Makefile#140, /default.prop may not be a symbolic link. Bug: 158552949 Test: atest CtsInitTestCases Change-Id: I19bde577fa50280e1ed6fb8fdbe846655abb930b Merged-In: I0d3f96c1656dfe02bfa0e801680f7fa887afd1d9 (cherry picked from commit 6f47feaccdbe849c982e0de9068e38be85006bfb)
diff --git a/init/util_test.cpp b/init/util_test.cpp index 96a5b55..08343dc 100644 --- a/init/util_test.cpp +++ b/init/util_test.cpp
@@ -61,8 +61,9 @@ TEST(util, ReadFileSymbolicLink) { errno = 0; - // lrw------- 1 root root 23 2008-12-31 19:00 default.prop -> system/etc/prop.default - auto file_contents = ReadFile("/default.prop"); + // lrwxrwxrwx 1 root shell 6 2020-06-26 09:55 /system/bin/ps -> toybox + auto file_contents = ReadFile("/system/bin/ps"); + EXPECT_EQ(ELOOP, errno); ASSERT_FALSE(file_contents.ok()); EXPECT_EQ("open() failed: Too many symbolic links encountered",