Skip to content

Commit a9b71af

Browse files
michaelrj-googleagozillon
michaelrj-google
authored and
agozillon
committed
[libc] add bazel support for most of unistd (llvm#80078)
Much of unistd involves modifying files. The tests for these functions need to use libc_make_test_file_path which didn't exist when they were first implemented. This patch adds most of unistd to the bazel along with the corresponding tests. Tests that modify directories had to be disabled since bazel doesn't seem to handle them properly.
1 parent 0eb1175 commit a9b71af

27 files changed

+707
-56
lines changed

‎libc/test/src/stdio/remove_test.cpp

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,9 @@ TEST(LlvmLibcRemoveTest, CreateAndRemoveFile) {
2323
libc_errno = 0;
2424
using LIBC_NAMESPACE::testing::ErrnoSetterMatcher::Fails;
2525
using LIBC_NAMESPACE::testing::ErrnoSetterMatcher::Succeeds;
26-
constexpr const char *TEST_FILE = "testdata/remove.test.file";
26+
27+
constexpr const char *FILENAME = "remove.test.file";
28+
auto TEST_FILE = libc_make_test_file_path(FILENAME);
2729
int fd = LIBC_NAMESPACE::open(TEST_FILE, O_WRONLY | O_CREAT, S_IRWXU);
2830
ASSERT_ERRNO_SUCCESS();
2931
ASSERT_GT(fd, 0);
@@ -40,7 +42,8 @@ TEST(LlvmLibcRemoveTest, CreateAndRemoveDir) {
4042
libc_errno = 0;
4143
using LIBC_NAMESPACE::testing::ErrnoSetterMatcher::Fails;
4244
using LIBC_NAMESPACE::testing::ErrnoSetterMatcher::Succeeds;
43-
constexpr const char *TEST_DIR = "testdata/remove.test.dir";
45+
constexpr const char *FILENAME = "remove.test.dir";
46+
auto TEST_DIR = libc_make_test_file_path(FILENAME);
4447
ASSERT_THAT(LIBC_NAMESPACE::mkdirat(AT_FDCWD, TEST_DIR, S_IRWXU),
4548
Succeeds(0));
4649

@@ -51,5 +54,5 @@ TEST(LlvmLibcRemoveTest, CreateAndRemoveDir) {
5154

5255
TEST(LlvmLibcRemoveTest, RemoveNonExistent) {
5356
using LIBC_NAMESPACE::testing::ErrnoSetterMatcher::Fails;
54-
ASSERT_THAT(LIBC_NAMESPACE::remove("testdata/non-existent"), Fails(ENOENT));
57+
ASSERT_THAT(LIBC_NAMESPACE::remove("non-existent"), Fails(ENOENT));
5558
}

‎libc/test/src/sys/stat/mkdirat_test.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@
1515

1616
TEST(LlvmLibcMkdiratTest, CreateAndRemove) {
1717
using LIBC_NAMESPACE::testing::ErrnoSetterMatcher::Succeeds;
18-
constexpr const char *TEST_DIR = "testdata/mkdirat.testdir";
18+
constexpr const char *FILENAME = "testdata/mkdirat.testdir";
19+
auto TEST_DIR = libc_make_test_file_path(FILENAME);
1920
ASSERT_THAT(LIBC_NAMESPACE::mkdirat(AT_FDCWD, TEST_DIR, S_IRWXU),
2021
Succeeds(0));
2122
ASSERT_THAT(LIBC_NAMESPACE::rmdir(TEST_DIR), Succeeds(0));

‎libc/test/src/unistd/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -159,6 +159,7 @@ add_libc_unittest(
159159
libc.src.unistd.fsync
160160
libc.src.unistd.read
161161
libc.src.unistd.write
162+
libc.src.stdio.remove
162163
libc.test.UnitTest.ErrnoSetterMatcher
163164
)
164165

‎libc/test/src/unistd/access_test.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
#include "src/unistd/close.h"
1313
#include "src/unistd/unlink.h"
1414
#include "test/UnitTest/ErrnoSetterMatcher.h"
15+
#include "test/UnitTest/LibcTest.h"
1516
#include "test/UnitTest/Test.h"
1617

1718
#include <sys/stat.h>
@@ -22,7 +23,8 @@ TEST(LlvmLibcAccessTest, CreateAndTest) {
2223
// test that it is accessable in those modes but not in others.
2324
libc_errno = 0;
2425
using LIBC_NAMESPACE::testing::ErrnoSetterMatcher::Succeeds;
25-
constexpr const char *TEST_FILE = "testdata/access.test";
26+
constexpr const char *FILENAME = "access.test";
27+
auto TEST_FILE = libc_make_test_file_path(FILENAME);
2628
int fd = LIBC_NAMESPACE::open(TEST_FILE, O_WRONLY | O_CREAT, S_IRWXU);
2729
ASSERT_ERRNO_SUCCESS();
2830
ASSERT_GT(fd, 0);

‎libc/test/src/unistd/chdir_test.cpp

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,12 @@ TEST(LlvmLibcChdirTest, ChangeAndOpen) {
2121
// directory and open the same file to make sure that the "chdir" operation
2222
// succeeded.
2323
using LIBC_NAMESPACE::testing::ErrnoSetterMatcher::Succeeds;
24-
constexpr const char *TEST_DIR = "testdata";
25-
constexpr const char *TEST_FILE = "testdata/chdir.test";
26-
constexpr const char *TEST_FILE_BASE = "chdir.test";
24+
constexpr const char *FILENAME = "testdata";
25+
auto TEST_DIR = libc_make_test_file_path(FILENAME);
26+
constexpr const char *FILENAME2 = "testdata/chdir.test";
27+
auto TEST_FILE = libc_make_test_file_path(FILENAME2);
28+
constexpr const char *FILENAME3 = "chdir.test";
29+
auto TEST_FILE_BASE = libc_make_test_file_path(FILENAME3);
2730
libc_errno = 0;
2831

2932
int fd = LIBC_NAMESPACE::open(TEST_FILE, O_PATH);

‎libc/test/src/unistd/dup2_test.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@ TEST(LlvmLibcdupTest, ReadAndWriteViaDup) {
2222
constexpr int DUPFD = 0xD0;
2323
libc_errno = 0;
2424
using LIBC_NAMESPACE::testing::ErrnoSetterMatcher::Succeeds;
25-
constexpr const char *TEST_FILE = "testdata/dup2.test";
25+
constexpr const char *FILENAME = "dup2.test";
26+
auto TEST_FILE = libc_make_test_file_path(FILENAME);
2627
int fd = LIBC_NAMESPACE::open(TEST_FILE, O_WRONLY | O_CREAT, S_IRWXU);
2728
ASSERT_ERRNO_SUCCESS();
2829
ASSERT_GT(fd, 0);

‎libc/test/src/unistd/dup3_test.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,8 @@ TEST(LlvmLibcdupTest, ReadAndWriteViaDup) {
2828
libc_errno = 0;
2929
using LIBC_NAMESPACE::testing::ErrnoSetterMatcher::Fails;
3030
using LIBC_NAMESPACE::testing::ErrnoSetterMatcher::Succeeds;
31-
constexpr const char *TEST_FILE = "testdata/dup3.test";
31+
constexpr const char *FILENAME = "dup3.test";
32+
auto TEST_FILE = libc_make_test_file_path(FILENAME);
3233
int fd = LIBC_NAMESPACE::open(TEST_FILE, O_WRONLY | O_CREAT, S_IRWXU);
3334
ASSERT_ERRNO_SUCCESS();
3435
ASSERT_GT(fd, 0);

‎libc/test/src/unistd/dup_test.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@
2121
TEST(LlvmLibcdupTest, ReadAndWriteViaDup) {
2222
libc_errno = 0;
2323
using LIBC_NAMESPACE::testing::ErrnoSetterMatcher::Succeeds;
24-
constexpr const char *TEST_FILE = "testdata/dup.test";
24+
constexpr const char *FILENAME = "dup.test";
25+
auto TEST_FILE = libc_make_test_file_path(FILENAME);
2526
int fd = LIBC_NAMESPACE::open(TEST_FILE, O_WRONLY | O_CREAT, S_IRWXU);
2627
ASSERT_ERRNO_SUCCESS();
2728
ASSERT_GT(fd, 0);

‎libc/test/src/unistd/fchdir_test.cpp

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,12 @@ TEST(LlvmLibcChdirTest, ChangeAndOpen) {
2121
// directory and open the same file to make sure that the "fchdir" operation
2222
// succeeded.
2323
using LIBC_NAMESPACE::testing::ErrnoSetterMatcher::Succeeds;
24-
constexpr const char *TEST_DIR = "testdata";
25-
constexpr const char *TEST_FILE = "testdata/fchdir.test";
26-
constexpr const char *TEST_FILE_BASE = "fchdir.test";
24+
constexpr const char *FILENAME = "testdata";
25+
auto TEST_DIR = libc_make_test_file_path(FILENAME);
26+
constexpr const char *FILENAME2 = "testdata/fchdir.test";
27+
auto TEST_FILE = libc_make_test_file_path(FILENAME2);
28+
constexpr const char *FILENAME3 = "fchdir.test";
29+
auto TEST_FILE_BASE = libc_make_test_file_path(FILENAME3);
2730
libc_errno = 0;
2831

2932
int dir_fd = LIBC_NAMESPACE::open(TEST_DIR, O_DIRECTORY);

‎libc/test/src/unistd/ftruncate_test.cpp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,8 @@ namespace cpp = LIBC_NAMESPACE::cpp;
2323

2424
TEST(LlvmLibcFtruncateTest, CreateAndTruncate) {
2525
using LIBC_NAMESPACE::testing::ErrnoSetterMatcher::Succeeds;
26-
constexpr const char TEST_FILE[] = "testdata/ftruncate.test";
26+
constexpr const char *FILENAME = "ftruncate.test";
27+
auto TEST_FILE = libc_make_test_file_path(FILENAME);
2728
constexpr const char WRITE_DATA[] = "hello, ftruncate";
2829
constexpr size_t WRITE_SIZE = sizeof(WRITE_DATA);
2930
char buf[WRITE_SIZE];
@@ -68,5 +69,5 @@ TEST(LlvmLibcFtruncateTest, CreateAndTruncate) {
6869

6970
TEST(LlvmLibcFtruncateTest, TruncateBadFD) {
7071
using LIBC_NAMESPACE::testing::ErrnoSetterMatcher::Fails;
71-
ASSERT_THAT(LIBC_NAMESPACE::ftruncate(1, off_t(1)), Fails(EINVAL));
72+
ASSERT_THAT(LIBC_NAMESPACE::ftruncate(0, off_t(1)), Fails(EINVAL));
7273
}

‎libc/test/src/unistd/isatty_test.cpp

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,8 @@ TEST(LlvmLibcIsATTYTest, BadFdTest) {
3939
}
4040

4141
TEST(LlvmLibcIsATTYTest, DevTTYTest) {
42-
constexpr const char *TTY_FILE = "/dev/tty";
42+
constexpr const char *FILENAME = "/dev/tty";
43+
auto TTY_FILE = libc_make_test_file_path(FILENAME);
4344
libc_errno = 0;
4445
int fd = LIBC_NAMESPACE::open(TTY_FILE, O_RDONLY);
4546
if (fd > 0) {
@@ -50,7 +51,8 @@ TEST(LlvmLibcIsATTYTest, DevTTYTest) {
5051
}
5152

5253
TEST(LlvmLibcIsATTYTest, FileTest) {
53-
constexpr const char *TEST_FILE = "testdata/isatty.test";
54+
constexpr const char *FILENAME = "isatty.test";
55+
auto TEST_FILE = libc_make_test_file_path(FILENAME);
5456
libc_errno = 0;
5557
int fd = LIBC_NAMESPACE::open(TEST_FILE, O_WRONLY | O_CREAT, S_IRWXU);
5658
ASSERT_ERRNO_SUCCESS();

‎libc/test/src/unistd/link_test.cpp

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,10 @@
1818

1919
TEST(LlvmLibcLinkTest, CreateAndUnlink) {
2020
using LIBC_NAMESPACE::testing::ErrnoSetterMatcher::Succeeds;
21-
constexpr const char *TEST_FILE = "testdata/link.test";
22-
constexpr const char *TEST_FILE_LINK = "testdata/link.test.link";
21+
constexpr const char *FILENAME = "link.test";
22+
auto TEST_FILE = libc_make_test_file_path(FILENAME);
23+
constexpr const char *FILENAME2 = "link.test.link";
24+
auto TEST_FILE_LINK = libc_make_test_file_path(FILENAME2);
2325

2426
// The test strategy is as follows:
2527
// 1. Create a normal file
@@ -44,7 +46,6 @@ TEST(LlvmLibcLinkTest, CreateAndUnlink) {
4446

4547
TEST(LlvmLibcLinkTest, LinkToNonExistentFile) {
4648
using LIBC_NAMESPACE::testing::ErrnoSetterMatcher::Fails;
47-
ASSERT_THAT(
48-
LIBC_NAMESPACE::link("testdata/non-existent-file", "testdata/bad-link"),
49-
Fails(ENOENT));
49+
ASSERT_THAT(LIBC_NAMESPACE::link("non-existent-file", "bad-link"),
50+
Fails(ENOENT));
5051
}

‎libc/test/src/unistd/linkat_test.cpp

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,16 @@
1818

1919
TEST(LlvmLibcLinkatTest, CreateAndUnlink) {
2020
using LIBC_NAMESPACE::testing::ErrnoSetterMatcher::Succeeds;
21-
constexpr const char *TEST_DIR = "testdata";
22-
constexpr const char *TEST_FILE = "linkat.test";
23-
constexpr const char *TEST_FILE_PATH = "testdata/linkat.test";
24-
constexpr const char *TEST_FILE_LINK = "linkat.test.link";
25-
constexpr const char *TEST_FILE_LINK_PATH = "testdata/linkat.test.link";
21+
constexpr const char *FILENAME = "testdata";
22+
auto TEST_DIR = libc_make_test_file_path(FILENAME);
23+
constexpr const char *FILENAME2 = "linkat.test";
24+
auto TEST_FILE = libc_make_test_file_path(FILENAME2);
25+
constexpr const char *FILENAME3 = "testdata/linkat.test";
26+
auto TEST_FILE_PATH = libc_make_test_file_path(FILENAME3);
27+
constexpr const char *FILENAME4 = "linkat.test.link";
28+
auto TEST_FILE_LINK = libc_make_test_file_path(FILENAME4);
29+
constexpr const char *FILENAME5 = "testdata/linkat.test.link";
30+
auto TEST_FILE_LINK_PATH = libc_make_test_file_path(FILENAME5);
2631

2732
// The test strategy is as follows:
2833
// 1. Create a normal file

‎libc/test/src/unistd/lseek_test.cpp

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@
1818

1919
TEST(LlvmLibcUniStd, LseekTest) {
2020
using LIBC_NAMESPACE::testing::ErrnoSetterMatcher::Succeeds;
21-
constexpr const char *TEST_FILE = "testdata/lseek.test";
21+
constexpr const char *FILENAME = "testdata/lseek.test";
22+
auto TEST_FILE = libc_make_test_file_path(FILENAME);
2223
int fd = LIBC_NAMESPACE::open(TEST_FILE, O_RDONLY);
2324
ASSERT_ERRNO_SUCCESS();
2425
ASSERT_GT(fd, 0);
@@ -52,7 +53,8 @@ TEST(LlvmLibcUniStd, LseekTest) {
5253
TEST(LlvmLibcUniStd, LseekFailsTest) {
5354
using LIBC_NAMESPACE::testing::ErrnoSetterMatcher::Fails;
5455
using LIBC_NAMESPACE::testing::ErrnoSetterMatcher::Succeeds;
55-
constexpr const char *TEST_FILE = "testdata/lseek.test";
56+
constexpr const char *FILENAME = "testdata/lseek.test";
57+
auto TEST_FILE = libc_make_test_file_path(FILENAME);
5658
int fd = LIBC_NAMESPACE::open(TEST_FILE, O_RDONLY);
5759
ASSERT_ERRNO_SUCCESS();
5860
ASSERT_GT(fd, 0);

‎libc/test/src/unistd/pread_pwrite_test.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,8 @@ TEST(LlvmLibcUniStd, PWriteAndPReadBackTest) {
3232

3333
using LIBC_NAMESPACE::testing::ErrnoSetterMatcher::Succeeds;
3434

35-
constexpr const char *TEST_FILE = "testdata/pread_pwrite.test";
35+
constexpr const char *FILENAME = "pread_pwrite.test";
36+
auto TEST_FILE = libc_make_test_file_path(FILENAME);
3637
int fd = LIBC_NAMESPACE::open(TEST_FILE, O_WRONLY | O_CREAT, S_IRWXU);
3738
ASSERT_ERRNO_SUCCESS();
3839
ASSERT_GT(fd, 0);

‎libc/test/src/unistd/read_write_test.cpp

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88

99
#include "src/errno/libc_errno.h"
1010
#include "src/fcntl/open.h"
11+
#include "src/stdio/remove.h"
1112
#include "src/unistd/close.h"
1213
#include "src/unistd/fsync.h"
1314
#include "src/unistd/read.h"
@@ -19,7 +20,9 @@
1920

2021
TEST(LlvmLibcUniStd, WriteAndReadBackTest) {
2122
using LIBC_NAMESPACE::testing::ErrnoSetterMatcher::Succeeds;
22-
constexpr const char *TEST_FILE = "__unistd_read_write.test";
23+
constexpr const char *FILENAME = "__unistd_read_write.test";
24+
auto TEST_FILE = libc_make_test_file_path(FILENAME);
25+
2326
int write_fd = LIBC_NAMESPACE::open(TEST_FILE, O_WRONLY | O_CREAT, S_IRWXU);
2427
ASSERT_ERRNO_SUCCESS();
2528
ASSERT_GT(write_fd, 0);
@@ -39,7 +42,7 @@ TEST(LlvmLibcUniStd, WriteAndReadBackTest) {
3942
EXPECT_STREQ(read_buf, HELLO);
4043
ASSERT_THAT(LIBC_NAMESPACE::close(read_fd), Succeeds(0));
4144

42-
// TODO: 'remove' the test file after the test.
45+
ASSERT_THAT(LIBC_NAMESPACE::remove(TEST_FILE), Succeeds(0));
4346
}
4447

4548
TEST(LlvmLibcUniStd, WriteFails) {

‎libc/test/src/unistd/readlink_test.cpp

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,10 @@ namespace cpp = LIBC_NAMESPACE::cpp;
1818

1919
TEST(LlvmLibcReadlinkTest, CreateAndUnlink) {
2020
using LIBC_NAMESPACE::testing::ErrnoSetterMatcher::Succeeds;
21-
constexpr const char LINK_VAL[] = "readlink_test_value";
22-
constexpr const char LINK[] = "testdata/readlink.test.link";
21+
constexpr const char *FILENAME = "readlink_test_value";
22+
auto LINK_VAL = libc_make_test_file_path(FILENAME);
23+
constexpr const char *FILENAME2 = "readlink.test.link";
24+
auto LINK = libc_make_test_file_path(FILENAME2);
2325
libc_errno = 0;
2426

2527
// The test strategy is as follows:

‎libc/test/src/unistd/readlinkat_test.cpp

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,10 @@ namespace cpp = LIBC_NAMESPACE::cpp;
2020

2121
TEST(LlvmLibcReadlinkatTest, CreateAndUnlink) {
2222
using LIBC_NAMESPACE::testing::ErrnoSetterMatcher::Succeeds;
23-
constexpr const char LINK_VAL[] = "readlinkat_test_value";
24-
constexpr const char LINK[] = "testdata/readlinkat.test.link";
23+
constexpr const char *FILENAME = "readlinkat_test_value";
24+
auto LINK_VAL = libc_make_test_file_path(FILENAME);
25+
constexpr const char *FILENAME2 = "readlinkat.test.link";
26+
auto LINK = libc_make_test_file_path(FILENAME2);
2527
libc_errno = 0;
2628

2729
// The test strategy is as follows:

‎libc/test/src/unistd/rmdir_test.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@
1616

1717
TEST(LlvmLibcRmdirTest, CreateAndRemove) {
1818
using LIBC_NAMESPACE::testing::ErrnoSetterMatcher::Succeeds;
19-
constexpr const char *TEST_DIR = "testdata/rmdir.testdir";
19+
constexpr const char *FILENAME = "rmdir.testdir";
20+
auto TEST_DIR = libc_make_test_file_path(FILENAME);
2021
ASSERT_THAT(LIBC_NAMESPACE::mkdir(TEST_DIR, S_IRWXU), Succeeds(0));
2122
ASSERT_THAT(LIBC_NAMESPACE::rmdir(TEST_DIR), Succeeds(0));
2223
}
2324

2425
TEST(LlvmLibcRmdirTest, RemoveNonExistentDir) {
2526
using LIBC_NAMESPACE::testing::ErrnoSetterMatcher::Fails;
26-
ASSERT_THAT(LIBC_NAMESPACE::rmdir("testdata/non-existent-dir"),
27-
Fails(ENOENT));
27+
ASSERT_THAT(LIBC_NAMESPACE::rmdir("non-existent-dir"), Fails(ENOENT));
2828
}

‎libc/test/src/unistd/symlink_test.cpp

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,12 @@
1818

1919
TEST(LlvmLibcSymlinkTest, CreateAndUnlink) {
2020
using LIBC_NAMESPACE::testing::ErrnoSetterMatcher::Succeeds;
21-
constexpr const char *TEST_FILE_BASE = "symlink.test";
22-
constexpr const char *TEST_FILE = "testdata/symlink.test";
23-
constexpr const char *TEST_FILE_LINK = "testdata/symlink.test.symlink";
21+
constexpr const char *FILENAME = "symlink.test";
22+
auto TEST_FILE_BASE = libc_make_test_file_path(FILENAME);
23+
constexpr const char *FILENAME2 = "symlink.test";
24+
auto TEST_FILE = libc_make_test_file_path(FILENAME2);
25+
constexpr const char *FILENAME3 = "symlink.test.symlink";
26+
auto TEST_FILE_LINK = libc_make_test_file_path(FILENAME3);
2427

2528
// The test strategy is as follows:
2629
// 1. Create a normal file

‎libc/test/src/unistd/symlinkat_test.cpp

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,16 @@
1818

1919
TEST(LlvmLibcSymlinkatTest, CreateAndUnlink) {
2020
using LIBC_NAMESPACE::testing::ErrnoSetterMatcher::Succeeds;
21-
constexpr const char *TEST_DIR = "testdata";
22-
constexpr const char *TEST_FILE = "symlinkat.test";
23-
constexpr const char *TEST_FILE_PATH = "testdata/symlinkat.test";
24-
constexpr const char *TEST_FILE_LINK = "symlinkat.test.link";
25-
constexpr const char *TEST_FILE_LINK_PATH = "testdata/symlinkat.test.link";
21+
constexpr const char *FILENAME = "testdata";
22+
auto TEST_DIR = libc_make_test_file_path(FILENAME);
23+
constexpr const char *FILENAME2 = "symlinkat.test";
24+
auto TEST_FILE = libc_make_test_file_path(FILENAME2);
25+
constexpr const char *FILENAME3 = "testdata/symlinkat.test";
26+
auto TEST_FILE_PATH = libc_make_test_file_path(FILENAME3);
27+
constexpr const char *FILENAME4 = "symlinkat.test.link";
28+
auto TEST_FILE_LINK = libc_make_test_file_path(FILENAME4);
29+
constexpr const char *FILENAME5 = "testdata/symlinkat.test.link";
30+
auto TEST_FILE_LINK_PATH = libc_make_test_file_path(FILENAME5);
2631

2732
// The test strategy is as follows:
2833
// 1. Create a normal file

‎libc/test/src/unistd/truncate_test.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,8 @@ namespace cpp = LIBC_NAMESPACE::cpp;
2323

2424
TEST(LlvmLibcTruncateTest, CreateAndTruncate) {
2525
using LIBC_NAMESPACE::testing::ErrnoSetterMatcher::Succeeds;
26-
constexpr const char TEST_FILE[] = "testdata/truncate.test";
26+
constexpr const char *FILENAME = "truncate.test";
27+
auto TEST_FILE = libc_make_test_file_path(FILENAME);
2728
constexpr const char WRITE_DATA[] = "hello, truncate";
2829
constexpr size_t WRITE_SIZE = sizeof(WRITE_DATA);
2930
char buf[WRITE_SIZE];

‎libc/test/src/unistd/unlink_test.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@
1717

1818
TEST(LlvmLibcUnlinkTest, CreateAndUnlink) {
1919
using LIBC_NAMESPACE::testing::ErrnoSetterMatcher::Succeeds;
20-
constexpr const char *TEST_FILE = "testdata/unlink.test";
20+
constexpr const char *FILENAME = "unlink.test";
21+
auto TEST_FILE = libc_make_test_file_path(FILENAME);
2122
int write_fd = LIBC_NAMESPACE::open(TEST_FILE, O_WRONLY | O_CREAT, S_IRWXU);
2223
ASSERT_ERRNO_SUCCESS();
2324
ASSERT_GT(write_fd, 0);
@@ -27,6 +28,5 @@ TEST(LlvmLibcUnlinkTest, CreateAndUnlink) {
2728

2829
TEST(LlvmLibcUnlinkTest, UnlinkNonExistentFile) {
2930
using LIBC_NAMESPACE::testing::ErrnoSetterMatcher::Fails;
30-
ASSERT_THAT(LIBC_NAMESPACE::unlink("testdata/non-existent-file"),
31-
Fails(ENOENT));
31+
ASSERT_THAT(LIBC_NAMESPACE::unlink("non-existent-file"), Fails(ENOENT));
3232
}

‎libc/test/src/unistd/unlinkat_test.cpp

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,10 @@
1818

1919
TEST(LlvmLibcUnlinkatTest, CreateAndDeleteTest) {
2020
using LIBC_NAMESPACE::testing::ErrnoSetterMatcher::Succeeds;
21-
constexpr const char *TEST_DIR = "testdata";
22-
constexpr const char *TEST_FILE = "openat.test";
21+
constexpr const char *FILENAME = "testdata";
22+
auto TEST_DIR = libc_make_test_file_path(FILENAME);
23+
constexpr const char *FILENAME2 = "openat.test";
24+
auto TEST_FILE = libc_make_test_file_path(FILENAME2);
2325
int dir_fd = LIBC_NAMESPACE::open(TEST_DIR, O_DIRECTORY);
2426
ASSERT_ERRNO_SUCCESS();
2527
ASSERT_GT(dir_fd, 0);
@@ -33,7 +35,8 @@ TEST(LlvmLibcUnlinkatTest, CreateAndDeleteTest) {
3335
}
3436

3537
TEST(LlvmLibcUnlinkatTest, UnlinkatNonExistentFile) {
36-
constexpr const char *TEST_DIR = "testdata";
38+
constexpr const char *FILENAME = "testdata";
39+
auto TEST_DIR = libc_make_test_file_path(FILENAME);
3740
int dir_fd = LIBC_NAMESPACE::open(TEST_DIR, O_DIRECTORY);
3841
ASSERT_ERRNO_SUCCESS();
3942
ASSERT_GT(dir_fd, 0);

0 commit comments

Comments
 (0)