tequilaOS/platform_bionic
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Merge "sys_vfs_test: fix expectation for Linux 6.7." into android13-tests-dev am: fb7d4c4761" into android14-tests-dev

Browse source
This commit is contained in:
Automerger Merge Worker 2024-01-31 16:02:58 +00:00 committed by Gerrit Code Review
commit 014dc3bc7b
1 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
tests/sys_vfs_test.cpp
View file

@ -28,10 +28,21 @@ template <typename StatFsT> void Check(StatFsT& sb) {
EXPECT_EQ(4096, static_cast<int>(sb.f_bsize));
EXPECT_EQ(0U, sb.f_bfree);
EXPECT_EQ(0U, sb.f_ffree);
EXPECT_EQ(0, sb.f_fsid.__val[0]);
EXPECT_EQ(0, sb.f_fsid.__val[1]);
EXPECT_EQ(255, static_cast<int>(sb.f_namelen));
// Linux 6.7 requires that all filesystems have a non-zero fsid.
if (sb.f_fsid.__val[0] != 0U) {
// fs/libfs.c reuses the filesystem's device number.
struct stat proc_sb;
ASSERT_EQ(0, stat("/proc", &proc_sb));
EXPECT_EQ(static_cast<int>(proc_sb.st_dev), sb.f_fsid.__val[0]);
EXPECT_EQ(0, sb.f_fsid.__val[1]);
} else {
// Prior to that, the fsid for /proc was just 0.
EXPECT_EQ(0, sb.f_fsid.__val[0]);
EXPECT_EQ(0, sb.f_fsid.__val[1]);
}
// The kernel sets a private bit to indicate that f_flags is valid.
// This flag is not supposed to be exposed to libc clients.
static const uint32_t ST_VALID = 0x0020;