diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-05-18 20:07:57 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2022-05-18 20:07:57 +0000 |
commit | c3b81ddfb76dd1981ecbb7edf5d8785e8c368663 (patch) | |
tree | df0e3aa7227090e55e3cbc1a00a3836fe126f247 | |
parent | b120c956d02ab6d2c5b040ca52c1608e4c3a5353 (diff) | |
parent | ef18e4dd4e6e9630fd22e6d1c941f4c0586afb60 (diff) | |
download | bionic-android10-tests-release.tar.gz |
Merge "Snap for 8605982 from 0462cfb7668678887778c1e4057c7ec0f3f6aa47 to android10-tests-release" into android10-tests-releaseandroid-vts-10.0_r16android-vts-10.0_r15android-vts-10.0_r14android-vts-10.0_r13android-cts-10.0_r16android-cts-10.0_r15android-cts-10.0_r14android-cts-10.0_r13android10-tests-release
-rw-r--r-- | tests/mntent_test.cpp | 30 |
1 files changed, 23 insertions, 7 deletions
diff --git a/tests/mntent_test.cpp b/tests/mntent_test.cpp index b86af9fb6..4b8fc9a80 100644 --- a/tests/mntent_test.cpp +++ b/tests/mntent_test.cpp @@ -19,24 +19,40 @@ #include <mntent.h> TEST(mntent, mntent_smoke) { + // Read all the entries with getmntent(). FILE* fp = setmntent("/proc/mounts", "r"); ASSERT_TRUE(fp != nullptr); - ASSERT_TRUE(getmntent(fp) != nullptr); + std::vector<std::string> fsnames; + std::vector<std::string> dirs; + mntent* me; + while ((me = getmntent(fp)) != nullptr) { + fsnames.push_back(me->mnt_fsname); + dirs.push_back(me->mnt_dir); + } + + ASSERT_EQ(1, endmntent(fp)); - bool saw_proc = false; + // Then again with getmntent_r(), checking they match. + fp = setmntent("/proc/mounts", "r"); + ASSERT_TRUE(fp != nullptr); struct mntent entry; char buf[BUFSIZ]; + size_t i = 0; while (getmntent_r(fp, &entry, buf, sizeof(buf)) != nullptr) { - if (strcmp(entry.mnt_fsname, "proc") == 0 && strcmp(entry.mnt_dir, "/proc") == 0) { - saw_proc = true; - } + ASSERT_EQ(fsnames[i], entry.mnt_fsname); + ASSERT_EQ(dirs[i], entry.mnt_dir); + i++; } - ASSERT_TRUE(saw_proc); - ASSERT_EQ(1, endmntent(fp)); + + // And just for good measure: we did see a /proc entry, right? + auto it = std::find(fsnames.begin(), fsnames.end(), "proc"); + ASSERT_TRUE(it != fsnames.end()); + size_t proc_index = it - fsnames.begin(); + ASSERT_EQ("/proc", dirs[proc_index]); } TEST(mntent, hasmntopt) { |