diff options
| author | Michael Jones <michaelrj@google.com> | 2024-11-12 15:40:52 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-11-12 18:40:52 -0500 |
| commit | d6219e65996a485adb3883c8cf3335ece68c66cf (patch) | |
| tree | 464871287a960d15afb4d4813b4a38293baff089 | |
| parent | 84e95beae980466ffcc555297e0e34d23fca8a76 (diff) | |
| download | llvm-d6219e65996a485adb3883c8cf3335ece68c66cf.zip llvm-d6219e65996a485adb3883c8cf3335ece68c66cf.tar.gz llvm-d6219e65996a485adb3883c8cf3335ece68c66cf.tar.bz2 | |
[libc] Make fstatvfs test less flakey (#115949)
| -rw-r--r-- | libc/test/src/sys/statvfs/linux/fstatvfs_test.cpp | 6 | ||||
| -rw-r--r-- | libc/test/src/sys/statvfs/linux/statvfs_test.cpp | 4 |
2 files changed, 9 insertions, 1 deletions
diff --git a/libc/test/src/sys/statvfs/linux/fstatvfs_test.cpp b/libc/test/src/sys/statvfs/linux/fstatvfs_test.cpp index 9daac13..f4d71e9 100644 --- a/libc/test/src/sys/statvfs/linux/fstatvfs_test.cpp +++ b/libc/test/src/sys/statvfs/linux/fstatvfs_test.cpp @@ -33,9 +33,13 @@ TEST(LlvmLibcSysFStatvfsTest, FStatvfsBasic) { TEST(LlvmLibcSysFStatvfsTest, FStatvfsInvalidPath) { struct statvfs buf; - constexpr const char *FILENAME = "statvfs.testdir"; + constexpr const char *FILENAME = "fstatvfs.testdir"; auto TEST_DIR = libc_make_test_file_path(FILENAME); + // Always delete the folder so that we start in a consistent state. + LIBC_NAMESPACE::rmdir(TEST_DIR); + LIBC_NAMESPACE::libc_errno = 0; // Reset errno + ASSERT_THAT(LIBC_NAMESPACE::mkdirat(AT_FDCWD, TEST_DIR, S_IRWXU), Succeeds(0)); diff --git a/libc/test/src/sys/statvfs/linux/statvfs_test.cpp b/libc/test/src/sys/statvfs/linux/statvfs_test.cpp index 68448e0..32f8120 100644 --- a/libc/test/src/sys/statvfs/linux/statvfs_test.cpp +++ b/libc/test/src/sys/statvfs/linux/statvfs_test.cpp @@ -33,6 +33,10 @@ TEST(LlvmLibcSysStatvfsTest, StatvfsInvalidPath) { constexpr const char *FILENAME = "statvfs.testdir"; auto TEST_DIR = libc_make_test_file_path(FILENAME); + // Always delete the folder so that we start in a consistent state. + LIBC_NAMESPACE::rmdir(TEST_DIR); + LIBC_NAMESPACE::libc_errno = 0; // Reset errno + ASSERT_THAT(LIBC_NAMESPACE::mkdirat(AT_FDCWD, TEST_DIR, S_IRWXU), Succeeds(0)); |