[libc-commits] [libc] [libc] Refactor statvfs tests (PR #114147)
Michael Jones via libc-commits
libc-commits at lists.llvm.org
Wed Oct 30 14:46:30 PDT 2024
https://github.com/michaelrj-google updated https://github.com/llvm/llvm-project/pull/114147
>From b1eb9536bca91b3b2f3b1884564a0caa3495dabf Mon Sep 17 00:00:00 2001
From: Michael Jones <michaelrj at google.com>
Date: Tue, 29 Oct 2024 16:07:31 -0700
Subject: [PATCH 1/2] [libc] Refactor statvfs tests
The previous statvfs tests had several issues, this patch updates them
to meet current standards.
---
.../test/src/sys/statvfs/linux/CMakeLists.txt | 6 +-
.../src/sys/statvfs/linux/fstatvfs_test.cpp | 81 ++++++++++---------
.../src/sys/statvfs/linux/statvfs_test.cpp | 71 +++++++---------
3 files changed, 78 insertions(+), 80 deletions(-)
diff --git a/libc/test/src/sys/statvfs/linux/CMakeLists.txt b/libc/test/src/sys/statvfs/linux/CMakeLists.txt
index 1f8688868e0438..fa1e9052d1cac4 100644
--- a/libc/test/src/sys/statvfs/linux/CMakeLists.txt
+++ b/libc/test/src/sys/statvfs/linux/CMakeLists.txt
@@ -8,8 +8,9 @@ add_libc_unittest(
statvfs_test.cpp
DEPENDS
libc.src.errno.errno
- libc.src.sys.statvfs.linux.statfs_utils
libc.src.sys.statvfs.statvfs
+ libc.src.sys.stat.mkdirat
+ libc.src.sys.stat.rmdir
libc.test.UnitTest.ErrnoSetterMatcher
)
@@ -21,8 +22,9 @@ add_libc_unittest(
fstatvfs_test.cpp
DEPENDS
libc.src.errno.errno
- libc.src.sys.statvfs.linux.statfs_utils
libc.src.sys.statvfs.fstatvfs
+ libc.src.sys.stat.mkdirat
+ libc.src.sys.stat.rmdir
libc.src.fcntl.open
libc.src.unistd.close
libc.test.UnitTest.ErrnoSetterMatcher
diff --git a/libc/test/src/sys/statvfs/linux/fstatvfs_test.cpp b/libc/test/src/sys/statvfs/linux/fstatvfs_test.cpp
index 2f3e0b96ff0957..d14df58534e3eb 100644
--- a/libc/test/src/sys/statvfs/linux/fstatvfs_test.cpp
+++ b/libc/test/src/sys/statvfs/linux/fstatvfs_test.cpp
@@ -1,49 +1,56 @@
+//===-- Unittests for fstatvfs --------------------------------------------===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
#include "hdr/fcntl_macros.h"
#include "src/__support/macros/config.h"
#include "src/fcntl/open.h"
+#include "src/sys/stat/mkdirat.h"
#include "src/sys/statvfs/fstatvfs.h"
-#include "src/sys/statvfs/linux/statfs_utils.h"
#include "src/unistd/close.h"
+#include "src/unistd/rmdir.h"
#include "test/UnitTest/ErrnoSetterMatcher.h"
-#include "test/UnitTest/LibcTest.h"
-#include <linux/magic.h>
+#include "test/UnitTest/Test.h"
+
using namespace LIBC_NAMESPACE::testing::ErrnoSetterMatcher;
-#ifdef SYS_statfs64
-using StatFs = statfs64;
-#else
-using StatFs = statfs;
-#endif
-
-namespace LIBC_NAMESPACE_DECL {
-static int fstatfs(int fd, StatFs *buf) {
- using namespace statfs_utils;
- if (cpp::optional<StatFs> result = linux_fstatfs(fd)) {
- *buf = *result;
- return 0;
- }
- return -1;
-}
-} // namespace LIBC_NAMESPACE_DECL
-
-struct PathFD {
- int fd;
- explicit PathFD(const char *path)
- : fd(LIBC_NAMESPACE::open(path, O_CLOEXEC | O_PATH)) {}
- ~PathFD() { LIBC_NAMESPACE::close(fd); }
- operator int() const { return fd; }
-};
-
-TEST(LlvmLibcSysStatvfsTest, FstatfsBasic) {
- StatFs buf;
- ASSERT_THAT(LIBC_NAMESPACE::fstatfs(PathFD("/"), &buf), Succeeds());
- ASSERT_THAT(LIBC_NAMESPACE::fstatfs(PathFD("/proc"), &buf), Succeeds());
- ASSERT_EQ(buf.f_type, static_cast<decltype(buf.f_type)>(PROC_SUPER_MAGIC));
- ASSERT_THAT(LIBC_NAMESPACE::fstatfs(PathFD("/sys"), &buf), Succeeds());
- ASSERT_EQ(buf.f_type, static_cast<decltype(buf.f_type)>(SYSFS_MAGIC));
+TEST(LlvmLibcSysFStatfsTest, FStatfsBasic) {
+ struct statvfs buf;
+
+ int fd = LIBC_NAMESPACE::open("/", O_PATH);
+ ASSERT_ERRNO_SUCCESS();
+ ASSERT_GT(fd, 0);
+
+ // The root of the file directory must always exist
+ ASSERT_THAT(LIBC_NAMESPACE::fstatvfs(fd, &buf), Succeeds());
+ ASSERT_THAT(LIBC_NAMESPACE::close(fd), Succeeds(0));
}
-TEST(LlvmLibcSysStatvfsTest, FstatvfsInvalidFD) {
+TEST(LlvmLibcSysFStatfsTest, FStatvfsInvalidPath) {
struct statvfs buf;
- ASSERT_THAT(LIBC_NAMESPACE::fstatvfs(-1, &buf), Fails(EBADF));
+
+ constexpr const char *FILENAME = "testdata/statvfs.testdir";
+ auto TEST_DIR = libc_make_test_file_path(FILENAME);
+
+ ASSERT_THAT(LIBC_NAMESPACE::mkdirat(AT_FDCWD, TEST_DIR, S_IRWXU),
+ Succeeds(0));
+
+ int fd = LIBC_NAMESPACE::open(TEST_DIR, O_PATH);
+ ASSERT_ERRNO_SUCCESS();
+ ASSERT_GT(fd, 0);
+
+ // create the file, assert it exists, then delete it and assert it doesn't
+ // exist anymore.
+
+ ASSERT_THAT(LIBC_NAMESPACE::fstatvfs(fd, &buf), Succeeds());
+
+ ASSERT_THAT(LIBC_NAMESPACE::rmdir(TEST_DIR), Succeeds(0));
+
+ ASSERT_THAT(LIBC_NAMESPACE::fstatvfs(fd, &buf), Fails(ENOENT));
+ ASSERT_THAT(LIBC_NAMESPACE::close(fd), Succeeds(0));
+ ASSERT_THAT(LIBC_NAMESPACE::fstatvfs(fd, &buf), Fails(ENOENT));
}
diff --git a/libc/test/src/sys/statvfs/linux/statvfs_test.cpp b/libc/test/src/sys/statvfs/linux/statvfs_test.cpp
index 5329adb54d64d0..b4e1d5a3297d9a 100644
--- a/libc/test/src/sys/statvfs/linux/statvfs_test.cpp
+++ b/libc/test/src/sys/statvfs/linux/statvfs_test.cpp
@@ -1,54 +1,43 @@
+//===-- Unittests for statvfs ---------------------------------------------===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+#include "hdr/fcntl_macros.h"
#include "src/__support/macros/config.h"
-#include "src/sys/statvfs/linux/statfs_utils.h"
+#include "src/sys/stat/mkdirat.h"
#include "src/sys/statvfs/statvfs.h"
+#include "src/unistd/rmdir.h"
#include "test/UnitTest/ErrnoSetterMatcher.h"
-#include "test/UnitTest/LibcTest.h"
-#include <linux/magic.h>
-using namespace LIBC_NAMESPACE::testing::ErrnoSetterMatcher;
+#include "test/UnitTest/Test.h"
-#ifdef SYS_statfs64
-using StatFs = statfs64;
-#else
-using StatFs = statfs;
-#endif
-
-namespace LIBC_NAMESPACE_DECL {
-static int statfs(const char *path, StatFs *buf) {
- using namespace statfs_utils;
- if (cpp::optional<LinuxStatFs> result = linux_statfs(path)) {
- *buf = *result;
- return 0;
- }
- return -1;
-}
-} // namespace LIBC_NAMESPACE_DECL
+using namespace LIBC_NAMESPACE::testing::ErrnoSetterMatcher;
TEST(LlvmLibcSysStatfsTest, StatfsBasic) {
- StatFs buf;
- ASSERT_THAT(LIBC_NAMESPACE::statfs("/", &buf), Succeeds());
- ASSERT_THAT(LIBC_NAMESPACE::statfs("/proc", &buf), Succeeds());
- ASSERT_EQ(buf.f_type, static_cast<decltype(buf.f_type)>(PROC_SUPER_MAGIC));
- ASSERT_THAT(LIBC_NAMESPACE::statfs("/sys", &buf), Succeeds());
- ASSERT_EQ(buf.f_type, static_cast<decltype(buf.f_type)>(SYSFS_MAGIC));
+ struct statvfs buf;
+ // The root of the file directory must always exist
+ ASSERT_THAT(LIBC_NAMESPACE::statvfs("/", &buf), Succeeds());
}
TEST(LlvmLibcSysStatfsTest, StatvfsInvalidPath) {
struct statvfs buf;
+
ASSERT_THAT(LIBC_NAMESPACE::statvfs("", &buf), Fails(ENOENT));
- ASSERT_THAT(LIBC_NAMESPACE::statvfs("/nonexistent", &buf), Fails(ENOENT));
- ASSERT_THAT(LIBC_NAMESPACE::statvfs("/dev/null/whatever", &buf),
- Fails(ENOTDIR));
- ASSERT_THAT(LIBC_NAMESPACE::statvfs(nullptr, &buf), Fails(EFAULT));
-}
-TEST(LlvmLibcSysStatfsTest, StatvfsNameTooLong) {
- struct statvfs buf;
- ASSERT_THAT(LIBC_NAMESPACE::statvfs("/", &buf), Succeeds());
- char *name = static_cast<char *>(__builtin_alloca(buf.f_namemax + 3));
- name[0] = '/';
- name[buf.f_namemax + 2] = '\0';
- for (unsigned i = 1; i < buf.f_namemax + 2; ++i) {
- name[i] = 'a';
- }
- ASSERT_THAT(LIBC_NAMESPACE::statvfs(name, &buf), Fails(ENAMETOOLONG));
+ // create the file, assert it exists, then delete it and assert it doesn't
+ // exist anymore.
+ constexpr const char *FILENAME = "testdata/statvfs.testdir";
+ auto TEST_DIR = libc_make_test_file_path(FILENAME);
+
+ ASSERT_THAT(LIBC_NAMESPACE::mkdirat(AT_FDCWD, TEST_DIR, S_IRWXU),
+ Succeeds(0));
+
+ ASSERT_THAT(LIBC_NAMESPACE::statvfs(TEST_DIR, &buf), Succeeds());
+
+ ASSERT_THAT(LIBC_NAMESPACE::rmdir(TEST_DIR), Succeeds(0));
+
+ ASSERT_THAT(LIBC_NAMESPACE::statvfs(TEST_DIR, &buf), Fails(ENOENT));
}
>From 953c6da6883ca8288e3fb7482638c76a65466d40 Mon Sep 17 00:00:00 2001
From: Michael Jones <michaelrj at google.com>
Date: Wed, 30 Oct 2024 14:36:56 -0700
Subject: [PATCH 2/2] fix test names
---
libc/test/src/sys/statvfs/linux/fstatvfs_test.cpp | 4 ++--
libc/test/src/sys/statvfs/linux/statvfs_test.cpp | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/libc/test/src/sys/statvfs/linux/fstatvfs_test.cpp b/libc/test/src/sys/statvfs/linux/fstatvfs_test.cpp
index d14df58534e3eb..efd1e688280b5f 100644
--- a/libc/test/src/sys/statvfs/linux/fstatvfs_test.cpp
+++ b/libc/test/src/sys/statvfs/linux/fstatvfs_test.cpp
@@ -18,7 +18,7 @@
using namespace LIBC_NAMESPACE::testing::ErrnoSetterMatcher;
-TEST(LlvmLibcSysFStatfsTest, FStatfsBasic) {
+TEST(LlvmLibcSysFStatvfsTest, FStatvfsBasic) {
struct statvfs buf;
int fd = LIBC_NAMESPACE::open("/", O_PATH);
@@ -30,7 +30,7 @@ TEST(LlvmLibcSysFStatfsTest, FStatfsBasic) {
ASSERT_THAT(LIBC_NAMESPACE::close(fd), Succeeds(0));
}
-TEST(LlvmLibcSysFStatfsTest, FStatvfsInvalidPath) {
+TEST(LlvmLibcSysFStatvfsTest, FStatvfsInvalidPath) {
struct statvfs buf;
constexpr const char *FILENAME = "testdata/statvfs.testdir";
diff --git a/libc/test/src/sys/statvfs/linux/statvfs_test.cpp b/libc/test/src/sys/statvfs/linux/statvfs_test.cpp
index b4e1d5a3297d9a..0b154e7aa3fb7c 100644
--- a/libc/test/src/sys/statvfs/linux/statvfs_test.cpp
+++ b/libc/test/src/sys/statvfs/linux/statvfs_test.cpp
@@ -16,13 +16,13 @@
using namespace LIBC_NAMESPACE::testing::ErrnoSetterMatcher;
-TEST(LlvmLibcSysStatfsTest, StatfsBasic) {
+TEST(LlvmLibcSysStatvfsTest, StatvfsBasic) {
struct statvfs buf;
// The root of the file directory must always exist
ASSERT_THAT(LIBC_NAMESPACE::statvfs("/", &buf), Succeeds());
}
-TEST(LlvmLibcSysStatfsTest, StatvfsInvalidPath) {
+TEST(LlvmLibcSysStatvfsTest, StatvfsInvalidPath) {
struct statvfs buf;
ASSERT_THAT(LIBC_NAMESPACE::statvfs("", &buf), Fails(ENOENT));
More information about the libc-commits
mailing list