[libc][test] Adjust header paths in tests

[Caslyn]

Since index_test.cpp and rindex_test.cpp now reside in /strings, adjust some header paths accordingly.

Link: #118899

[llvmbot]

@llvm/pr-subscribers-libc

Author: Caslyn Tonelli (Caslyn)

Changes

Since index_test.cpp and rindex_test.cpp now reside in /strings, adjust some header paths accordingly.

---

Full diff: https://github.com/llvm/llvm-project/pull/119623.diff

2 Files Affected:

• (modified) libc/test/src/strings/index_test.cpp (+2-2)
• (modified) libc/test/src/strings/rindex_test.cpp (+2-2)

diff --git a/libc/test/src/strings/index_test.cpp b/libc/test/src/strings/index_test.cpp
index 88953205009d76..fc4cd2b31c55d1 100644
--- a/libc/test/src/strings/index_test.cpp
+++ b/libc/test/src/strings/index_test.cpp
@@ -6,9 +6,9 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "StrchrTest.h"
+#include "test/src/string/StrchrTest.h"
 
-#include "src/string/index.h"
+#include "src/strings/index.h"
 #include "test/UnitTest/Test.h"
 
 STRCHR_TEST(Index, LIBC_NAMESPACE::index)
diff --git a/libc/test/src/strings/rindex_test.cpp b/libc/test/src/strings/rindex_test.cpp
index 10513919cffa2d..d3b756fe5f6e52 100644
--- a/libc/test/src/strings/rindex_test.cpp
+++ b/libc/test/src/strings/rindex_test.cpp
@@ -6,9 +6,9 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "StrchrTest.h"
+#include "test/src/string/StrchrTest.h"
 
-#include "src/string/rindex.h"
+#include "src/strings/rindex.h"
 #include "test/UnitTest/Test.h"
 
 STRRCHR_TEST(Rindex, LIBC_NAMESPACE::rindex)

[nickdesaulniers]

Thanks for the fix!

Did you happen to spot this via a build breakage, per chance? I don't have any build breakages on my end, but that's making me think I should go investigate why that would be.

[nickdesaulniers]

ninja libc-strings-tests doesn't appear to be building/running the index/rindex tests...uh oh

[nickdesaulniers]

Do you mind folding this diff into your patch?

diff --git a/libc/test/src/strings/CMakeLists.txt b/libc/test/src/strings/CMakeLists.txt
index 963a1d6d6d60..10f96b8531f6 100644
--- a/libc/test/src/strings/CMakeLists.txt
+++ b/libc/test/src/strings/CMakeLists.txt
@@ -20,7 +20,7 @@ add_libc_test(
     index_test.cpp
   DEPENDS
     libc.src.strings.index
-    libc.test.src.strchr_test_support
+    libc.test.src.string.strchr_test_support
 )
 
 add_libc_test(
@@ -31,7 +31,7 @@ add_libc_test(
     rindex_test.cpp
   DEPENDS
     libc.src.strings.rindex
-    libc.test.src.strchr_test_support
+    libc.test.src.string.strchr_test_support
 )
 
 add_libc_test(

otherwise I'll send a new PR for it. I messed that up in #118899.

[Caslyn]

Did you happen to spot this via a build breakage, per chance? I don't have any build breakages on my end, but that's making me think I should go investigate why that would be.

Only actually spotted this while adjusting our build targets down stream in Fuchsia to match the /string -> /strings move.