Skip to content

Commit e28df25

Browse files
[libc] Fix readlink tests on 32-bit systems
Use sizeof in a string literal instead of a CString so we get the right size when creating the buf array. We also now use strlen(FILENAME) to get the string lenght when calling readlink and readlinkat.
1 parent 3bfc516 commit e28df25

File tree

3 files changed

+18
-10
lines changed

3 files changed

+18
-10
lines changed

libc/test/src/unistd/CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -262,6 +262,7 @@ add_libc_unittest(
262262
libc.include.unistd
263263
libc.src.errno.errno
264264
libc.src.unistd.readlink
265+
libc.src.string.string_utils
265266
libc.src.unistd.symlink
266267
libc.src.unistd.unlink
267268
libc.src.__support.CPP.string_view
@@ -278,6 +279,7 @@ add_libc_unittest(
278279
libc.include.fcntl
279280
libc.include.unistd
280281
libc.src.errno.errno
282+
libc.src.string.string_utils
281283
libc.src.unistd.readlinkat
282284
libc.src.unistd.symlink
283285
libc.src.unistd.unlink

libc/test/src/unistd/readlink_test.cpp

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
#include "src/__support/CPP/string_view.h"
1010
#include "src/errno/libc_errno.h"
1111
#include "src/unistd/readlink.h"
12+
#include "src/string/string_utils.h"
1213
#include "src/unistd/symlink.h"
1314
#include "src/unistd/unlink.h"
1415
#include "test/UnitTest/ErrnoSetterMatcher.h"
@@ -30,8 +31,9 @@ TEST(LlvmLibcReadlinkTest, CreateAndUnlink) {
3031
// 3. Cleanup the symlink created in step #1.
3132
ASSERT_THAT(LIBC_NAMESPACE::symlink(LINK_VAL, LINK), Succeeds(0));
3233

33-
char buf[sizeof(LINK_VAL)];
34-
ssize_t len = LIBC_NAMESPACE::readlink(LINK, buf, sizeof(buf));
34+
char buf[sizeof(FILENAME)];
35+
ssize_t len = LIBC_NAMESPACE::readlink(
36+
LINK, buf, LIBC_NAMESPACE::internal::string_length(FILENAME));
3537
ASSERT_ERRNO_SUCCESS();
3638
ASSERT_EQ(cpp::string_view(buf, len), cpp::string_view(LINK_VAL));
3739

@@ -40,7 +42,8 @@ TEST(LlvmLibcReadlinkTest, CreateAndUnlink) {
4042

4143
TEST(LlvmLibcReadlinkTest, ReadlinkInNonExistentPath) {
4244
using LIBC_NAMESPACE::testing::ErrnoSetterMatcher::Fails;
43-
char buf[8];
44-
ASSERT_THAT(LIBC_NAMESPACE::readlink("non-existent-link", buf, sizeof(buf)),
45+
constexpr auto len = 8;
46+
char buf[len];
47+
ASSERT_THAT(LIBC_NAMESPACE::readlink("non-existent-link", buf, len),
4548
Fails(ENOENT));
4649
}

libc/test/src/unistd/readlinkat_test.cpp

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
#include "src/__support/CPP/string_view.h"
1010
#include "src/errno/libc_errno.h"
1111
#include "src/unistd/readlinkat.h"
12+
#include "src/string/string_utils.h"
1213
#include "src/unistd/symlink.h"
1314
#include "src/unistd/unlink.h"
1415
#include "test/UnitTest/ErrnoSetterMatcher.h"
@@ -32,8 +33,9 @@ TEST(LlvmLibcReadlinkatTest, CreateAndUnlink) {
3233
// 3. Cleanup the symlink created in step #1.
3334
ASSERT_THAT(LIBC_NAMESPACE::symlink(LINK_VAL, LINK), Succeeds(0));
3435

35-
char buf[sizeof(LINK_VAL)];
36-
ssize_t len = LIBC_NAMESPACE::readlinkat(AT_FDCWD, LINK, buf, sizeof(buf));
36+
char buf[sizeof(FILENAME)];
37+
ssize_t len = LIBC_NAMESPACE::readlinkat(
38+
AT_FDCWD, LINK, buf, LIBC_NAMESPACE::internal::string_length(FILENAME));
3739
ASSERT_ERRNO_SUCCESS();
3840
ASSERT_EQ(cpp::string_view(buf, len), cpp::string_view(LINK_VAL));
3941

@@ -42,8 +44,9 @@ TEST(LlvmLibcReadlinkatTest, CreateAndUnlink) {
4244

4345
TEST(LlvmLibcReadlinkatTest, ReadlinkInNonExistentPath) {
4446
using LIBC_NAMESPACE::testing::ErrnoSetterMatcher::Fails;
45-
char buf[8];
46-
ASSERT_THAT(LIBC_NAMESPACE::readlinkat(AT_FDCWD, "non-existent-link", buf,
47-
sizeof(buf)),
48-
Fails(ENOENT));
47+
constexpr auto len = 8;
48+
char buf[len];
49+
ASSERT_THAT(
50+
LIBC_NAMESPACE::readlinkat(AT_FDCWD, "non-existent-link", buf, len),
51+
Fails(ENOENT));
4952
}

0 commit comments

Comments
 (0)