Merge commit '8f9eb7035344' from llvm.org/master into apple/master

git apple-llvm automerger · git apple-llvm automerger · commit 79e5309d7c95 · 2020-06-12T14:18:27.000-07:00
diff --git a/lldb/unittests/CMakeLists.txt b/lldb/unittests/CMakeLists.txt
@@ -33,6 +33,10 @@ function(add_lldb_unittest test_name)
     "LINK_LIBS;LINK_COMPONENTS"
     ${ARGN})
 
+  if (NOT ${test_name} MATCHES "Tests$")
+    message(FATAL_ERROR "Unit test name must end with 'Tests' for lit to find it.")
+  endif()
+
   list(APPEND LLVM_LINK_COMPONENTS ${ARG_LINK_COMPONENTS})
 
   add_unittest(LLDBUnitTests
diff --git a/lldb/unittests/Platform/Android/CMakeLists.txt b/lldb/unittests/Platform/Android/CMakeLists.txt
@@ -1,6 +1,6 @@
 include_directories(${LLDB_SOURCE_DIR}/source/Plugins/Platform/Android)
 
-add_lldb_unittest(AdbClientTest
+add_lldb_unittest(AdbClientTests
   AdbClientTest.cpp
 
   LINK_LIBS
diff --git a/lldb/unittests/Process/Linux/CMakeLists.txt b/lldb/unittests/Process/Linux/CMakeLists.txt
@@ -1,6 +1,6 @@
 include_directories(${LLDB_SOURCE_DIR}/source/Plugins/Process/Linux)
 
-add_lldb_unittest(ProcessorTraceTest
+add_lldb_unittest(ProcessorTraceTests
   ProcessorTraceTest.cpp
 
   LINK_LIBS
diff --git a/lldb/unittests/Process/POSIX/CMakeLists.txt b/lldb/unittests/Process/POSIX/CMakeLists.txt
@@ -1,6 +1,6 @@
 include_directories(${LLDB_SOURCE_DIR}/source/Plugins/Process/POSIX)
 
-add_lldb_unittest(ProcessPOSIXTest
+add_lldb_unittest(ProcessPOSIXTests
   NativeProcessELFTest.cpp
 
   LINK_LIBS
