[libc] fix strtointmax tests

The strtointmax tests weren't running because they depend on the same
shared logic as strtol tests and the target for that was being defined
after the inttypes targets, causing them to be skipped. This patch moves
the inttypes test directory later in the order so that the shared tests
are defined before inttypes tests try to use them.

Reviewed By: sivachandra, lntue

Differential Revision: https://reviews.llvm.org/D142515

diff --git a/libc/test/src/CMakeLists.txt b/libc/test/src/CMakeLists.txt
index 6a9ab8f..e47a245 100644 (file)
--- a/libc/test/src/CMakeLists.txt
+++ b/libc/test/src/CMakeLists.txt
@@ -30,10 +30,10 @@ add_subdirectory(__support)
 add_subdirectory(ctype)
 add_subdirectory(errno)
 add_subdirectory(fenv)
-add_subdirectory(inttypes)
 add_subdirectory(math)
 add_subdirectory(string)
 add_subdirectory(stdlib)
+add_subdirectory(inttypes)
 add_subdirectory(stdio)
 
 if(${LIBC_TARGET_OS} STREQUAL "linux")

diff --git a/libc/test/src/inttypes/CMakeLists.txt b/libc/test/src/inttypes/CMakeLists.txt
index 1507941..7fee729 100644 (file)
--- a/libc/test/src/inttypes/CMakeLists.txt
+++ b/libc/test/src/inttypes/CMakeLists.txt
@@ -8,7 +8,7 @@ add_libc_unittest(
     strtoimax_test.cpp
   DEPENDS
     libc.src.inttypes.strtoimax
-    libc.test.stdlib.strtol_test_support
+    libc.test.src.stdlib.strtol_test_support
 )
 
 add_libc_unittest(
@@ -19,7 +19,7 @@ add_libc_unittest(
     strtoumax_test.cpp
   DEPENDS
     libc.src.inttypes.strtoumax
-    libc.test.stdlib.strtol_test_support
+    libc.test.src.stdlib.strtol_test_support
 )
 
 add_libc_unittest(