From 86bc9a83e17c5939ae0170cd81b8b66324fc386d Mon Sep 17 00:00:00 2001 From: Mark de Wever Date: Wed, 27 Mar 2024 20:41:15 +0100 Subject: [PATCH] [libc++][test] Improves src include paths. Instead of including a relative path use an absolute path based on the available lit substitution. This makes it easier to understand what is included and moving the test to a different directory level no longer breaks the test. This is based on a question by @EricWF in https://github.com/llvm/llvm-project/pull/82113. --- .../directory_entry.mods/last_write_time.pass.cpp | 2 +- .../libcxx/input.output/filesystems/convert_file_time.pass.cpp | 2 +- libcxx/test/libcxx/time/time.zone/time.zone.db/rules.pass.cpp | 2 +- libcxx/test/libcxx/time/time.zone/time.zone.db/zones.pass.cpp | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libcxx/test/libcxx/input.output/filesystems/class.directory_entry/directory_entry.mods/last_write_time.pass.cpp b/libcxx/test/libcxx/input.output/filesystems/class.directory_entry/directory_entry.mods/last_write_time.pass.cpp index 26703f748d874..1acbed55d2b51 100644 --- a/libcxx/test/libcxx/input.output/filesystems/class.directory_entry/directory_entry.mods/last_write_time.pass.cpp +++ b/libcxx/test/libcxx/input.output/filesystems/class.directory_entry/directory_entry.mods/last_write_time.pass.cpp @@ -9,7 +9,7 @@ // UNSUPPORTED: c++03, c++11, c++14 // UNSUPPORTED: availability-filesystem-missing // UNSUPPORTED: no-filesystem -// ADDITIONAL_COMPILE_FLAGS: -I %S/../../../../../../src +// ADDITIONAL_COMPILE_FLAGS: -I %{libcxx-dir}/src // This test relies on calling functions from the libcxx internal headers // of ; the Windows implementation uses different diff --git a/libcxx/test/libcxx/input.output/filesystems/convert_file_time.pass.cpp b/libcxx/test/libcxx/input.output/filesystems/convert_file_time.pass.cpp index 3c901c4e9f2e8..699bbfb9e6dc8 100644 --- a/libcxx/test/libcxx/input.output/filesystems/convert_file_time.pass.cpp +++ b/libcxx/test/libcxx/input.output/filesystems/convert_file_time.pass.cpp @@ -13,7 +13,7 @@ // typedef TrivialClock file_time_type; -// ADDITIONAL_COMPILE_FLAGS: -I %S/../../../../src -Wno-macro-redefined +// ADDITIONAL_COMPILE_FLAGS: -I %{libcxx-dir}/src -Wno-macro-redefined #include #include diff --git a/libcxx/test/libcxx/time/time.zone/time.zone.db/rules.pass.cpp b/libcxx/test/libcxx/time/time.zone/time.zone.db/rules.pass.cpp index 4814f4aad87fb..fcfc34625fbec 100644 --- a/libcxx/test/libcxx/time/time.zone/time.zone.db/rules.pass.cpp +++ b/libcxx/test/libcxx/time/time.zone/time.zone.db/rules.pass.cpp @@ -17,7 +17,7 @@ // Tests the IANA database rules parsing and operations. // This is not part of the public tzdb interface. // The test uses private implementation headers. -// ADDITIONAL_COMPILE_FLAGS: -I %S/../../../../../src/include +// ADDITIONAL_COMPILE_FLAGS: -I %{libcxx-dir}/src/include #include #include diff --git a/libcxx/test/libcxx/time/time.zone/time.zone.db/zones.pass.cpp b/libcxx/test/libcxx/time/time.zone/time.zone.db/zones.pass.cpp index 8571e0d05ebbd..e97b36fca2bb6 100644 --- a/libcxx/test/libcxx/time/time.zone/time.zone.db/zones.pass.cpp +++ b/libcxx/test/libcxx/time/time.zone/time.zone.db/zones.pass.cpp @@ -17,7 +17,7 @@ // Tests the IANA database zones parsing and operations. // This is not part of the public tzdb interface. // The test uses private implementation headers. -// ADDITIONAL_COMPILE_FLAGS: -I %S/../../../../../src/include +// ADDITIONAL_COMPILE_FLAGS: -I %{libcxx-dir}/src/include #include #include