Skip to content

[libc] Fix suseconds_t definition and utimes_test #134326

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Apr 4, 2025
Merged

[libc] Fix suseconds_t definition and utimes_test #134326

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3c03d41
[libc] Fix utimes use of file paths
michaelrj-google Apr 3, 2025
40b85bf
fix the actual underlying issue.
michaelrj-google Apr 4, 2025
4042bd7
use proxy header, new errno test framework.
michaelrj-google Apr 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion libc/include/llvm-libc-types/suseconds_t.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,11 @@
#ifndef LLVM_LIBC_TYPES_SUSECONDS_T_H
#define LLVM_LIBC_TYPES_SUSECONDS_T_H

typedef __INT32_TYPE__ suseconds_t;
// Per posix: suseconds_t shall be a signed integer type capable of storing
// values at least in the range [-1, 1000000]. [...] the widths of [other
// types...] and suseconds_t are no greater than the width of type long.

// The kernel expects 64 bit suseconds_t at least on x86_64.
typedef long suseconds_t;

#endif // LLVM_LIBC_TYPES_SUSECONDS_T_H
2 changes: 2 additions & 0 deletions libc/test/src/sys/time/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ add_libc_unittest(
utimes_test.cpp
DEPENDS
libc.hdr.fcntl_macros
libc.hdr.sys_stat_macros
libc.src.errno.errno
libc.src.fcntl.open
libc.src.sys.time.utimes
Expand All @@ -16,4 +17,5 @@ add_libc_unittest(
libc.src.unistd.write
libc.src.stdio.remove
libc.src.sys.stat.stat
libc.test.UnitTest.ErrnoCheckingTest
)
22 changes: 14 additions & 8 deletions libc/test/src/sys/time/utimes_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,24 +7,30 @@
//===----------------------------------------------------------------------===//

#include "hdr/fcntl_macros.h"
#include "hdr/sys_stat_macros.h"
#include "hdr/types/struct_timeval.h"
#include "src/errno/libc_errno.h"
#include "src/fcntl/open.h"
#include "src/stdio/remove.h"
#include "src/sys/stat/stat.h"
#include "src/sys/time/utimes.h"
#include "src/unistd/close.h"

#include "test/UnitTest/ErrnoCheckingTest.h"
#include "test/UnitTest/ErrnoSetterMatcher.h"
#include "test/UnitTest/Test.h"

using LlvmLibcUtimesTest = LIBC_NAMESPACE::testing::ErrnoCheckingTest;

// SUCCESS: Takes a file and successfully updates
// its last access and modified times.
TEST(LlvmLibcUtimesTest, ChangeTimesSpecific) {
TEST_F(LlvmLibcUtimesTest, ChangeTimesSpecific) {
using LIBC_NAMESPACE::testing::ErrnoSetterMatcher::Succeeds;

constexpr const char *FILE_PATH = "utimes_pass.test";
auto TEST_FILE = libc_make_test_file_path(FILE_PATH);
int fd = LIBC_NAMESPACE::open(TEST_FILE, O_WRONLY | O_CREAT);
int fd = LIBC_NAMESPACE::open(TEST_FILE, O_WRONLY | O_CREAT, S_IRWXU);
ASSERT_ERRNO_SUCCESS();
ASSERT_GT(fd, 0);
ASSERT_THAT(LIBC_NAMESPACE::close(fd), Succeeds(0));

Expand All @@ -36,11 +42,11 @@ TEST(LlvmLibcUtimesTest, ChangeTimesSpecific) {
times[1].tv_usec = 23456;

// ensure utimes succeeds
ASSERT_THAT(LIBC_NAMESPACE::utimes(FILE_PATH, times), Succeeds(0));
ASSERT_THAT(LIBC_NAMESPACE::utimes(TEST_FILE, times), Succeeds(0));

// verify the times values against stat of the TEST_FILE
struct stat statbuf;
ASSERT_EQ(LIBC_NAMESPACE::stat(FILE_PATH, &statbuf), 0);
ASSERT_EQ(LIBC_NAMESPACE::stat(TEST_FILE, &statbuf), 0);

// seconds
ASSERT_EQ(statbuf.st_atim.tv_sec, times[0].tv_sec);
Expand All @@ -57,13 +63,13 @@ TEST(LlvmLibcUtimesTest, ChangeTimesSpecific) {

// FAILURE: Invalid values in the timeval struct
// to check that utimes rejects it.
TEST(LlvmLibcUtimesTest, InvalidMicroseconds) {
TEST_F(LlvmLibcUtimesTest, InvalidMicroseconds) {
using LIBC_NAMESPACE::testing::ErrnoSetterMatcher::Fails;
using LIBC_NAMESPACE::testing::ErrnoSetterMatcher::Succeeds;

constexpr const char *FILE_PATH = "utimes_fail.test";
auto TEST_FILE = libc_make_test_file_path(FILE_PATH);
int fd = LIBC_NAMESPACE::open(TEST_FILE, O_WRONLY | O_CREAT);
int fd = LIBC_NAMESPACE::open(TEST_FILE, O_WRONLY | O_CREAT, S_IRWXU);
ASSERT_GT(fd, 0);
ASSERT_THAT(LIBC_NAMESPACE::close(fd), Succeeds(0));

Expand All @@ -76,7 +82,7 @@ TEST(LlvmLibcUtimesTest, InvalidMicroseconds) {
times[1].tv_usec = 1000000; // invalid

// ensure utimes fails
ASSERT_THAT(LIBC_NAMESPACE::utimes(FILE_PATH, times), Fails(EINVAL));
ASSERT_THAT(LIBC_NAMESPACE::utimes(TEST_FILE, times), Fails(EINVAL));

// check for failure on
// the other possible bad values
Expand All @@ -87,6 +93,6 @@ TEST(LlvmLibcUtimesTest, InvalidMicroseconds) {
times[1].tv_usec = 1000;

// ensure utimes fails once more
ASSERT_THAT(LIBC_NAMESPACE::utimes(FILE_PATH, times), Fails(EINVAL));
ASSERT_THAT(LIBC_NAMESPACE::utimes(TEST_FILE, times), Fails(EINVAL));
ASSERT_THAT(LIBC_NAMESPACE::remove(TEST_FILE), Succeeds(0));
}
Loading