From 7ca17cf43a65a0bc20d6ac2edcab6025b21c37db Mon Sep 17 00:00:00 2001
From: James Henderson <james.henderson@sony.com>
Date: Mon, 8 Feb 2021 15:40:55 +0000
Subject: [PATCH] [RFC][debuginfo-test] Rename debug-info lit tests for general
 purposes

Discussion thread:
https://lists.llvm.org/pipermail/llvm-dev/2021-January/148048.html

Move debuginfo-test into a subdirectory of a new top-level directory,
called cross-project-tests. The new name replaces "debuginfo-test" as an
LLVM project enabled via LLVM_ENABLE_PROJECTS.

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

Reviewed by: aprantl
---
 CMakeLists.txt          | 2 +-
 docs/CMake.rst          | 2 +-
 docs/GettingStarted.rst | 2 +-
 docs/TestingGuide.rst   | 2 +-
 projects/CMakeLists.txt | 4 ++--
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 135036f509d..5d3ad7a4fd5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -64,7 +64,7 @@ endif()
 # LLVM_EXTERNAL_${project}_SOURCE_DIR using LLVM_ALL_PROJECTS
 # This allows an easy way of setting up a build directory for llvm and another
 # one for llvm+clang+... using the same sources.
-set(LLVM_ALL_PROJECTS "clang;clang-tools-extra;compiler-rt;debuginfo-tests;libc;libclc;libcxx;libcxxabi;libunwind;lld;lldb;mlir;openmp;parallel-libs;polly;pstl")
+set(LLVM_ALL_PROJECTS "clang;clang-tools-extra;compiler-rt;cross-project-tests;libc;libclc;libcxx;libcxxabi;libunwind;lld;lldb;mlir;openmp;parallel-libs;polly;pstl")
 # The flang project is not yet part of "all" projects (see C++ requirements)
 set(LLVM_EXTRA_PROJECTS "flang")
 # List of all known projects in the mono repo
diff --git a/docs/CMake.rst b/docs/CMake.rst
index f1ac2c7d493..bab0508fdeb 100644
--- a/docs/CMake.rst
+++ b/docs/CMake.rst
@@ -434,7 +434,7 @@ LLVM-specific variables
   This feature allows to have one build for only LLVM and another for clang+llvm
   using the same source checkout.
   The full list is:
-  ``clang;clang-tools-extra;compiler-rt;debuginfo-tests;libc;libclc;libcxx;libcxxabi;libunwind;lld;lldb;openmp;parallel-libs;polly;pstl``
+  ``clang;clang-tools-extra;compiler-rt;cross-project-tests;libc;libclc;libcxx;libcxxabi;libunwind;lld;lldb;openmp;parallel-libs;polly;pstl``
 
 **LLVM_ENABLE_RTTI**:BOOL
   Build LLVM with run-time type information. Defaults to OFF.
diff --git a/docs/GettingStarted.rst b/docs/GettingStarted.rst
index e44059b3031..b776ae742b4 100644
--- a/docs/GettingStarted.rst
+++ b/docs/GettingStarted.rst
@@ -64,7 +64,7 @@ This is an example workflow and configuration to get and build the LLVM source:
      * ``-DLLVM_ENABLE_PROJECTS='...'`` --- semicolon-separated list of the LLVM
        subprojects you'd like to additionally build. Can include any of: clang,
        clang-tools-extra, libcxx, libcxxabi, libunwind, lldb, compiler-rt, lld,
-       polly, or debuginfo-tests.
+       polly, or cross-project-tests.
 
        For example, to build LLVM, Clang, libcxx, and libcxxabi, use
        ``-DLLVM_ENABLE_PROJECTS="clang;libcxx;libcxxabi"``.
diff --git a/docs/TestingGuide.rst b/docs/TestingGuide.rst
index 64c1c0ea78e..4ec6a3d52b0 100644
--- a/docs/TestingGuide.rst
+++ b/docs/TestingGuide.rst
@@ -107,7 +107,7 @@ The test are written in C based languages or in LLVM assembly language.
 These tests are compiled and run under a debugger. The debugger output
 is checked to validate of debugging information. See README.txt in the
 test suite for more information. This test suite is located in the
-``debuginfo-tests`` Subversion module.
+``cross-project-tests/debuginfo-tests`` directory.
 
 Quick start
 ===========
diff --git a/projects/CMakeLists.txt b/projects/CMakeLists.txt
index 7a948bdc850..0ffc4fa3c04 100644
--- a/projects/CMakeLists.txt
+++ b/projects/CMakeLists.txt
@@ -12,7 +12,7 @@ foreach(entry ${entries})
        (NOT ${entry} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR}/test-suite) AND
        (NOT ${entry} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR}/parallel-libs) AND
        (NOT ${entry} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR}/openmp) AND
-       (NOT ${entry} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR}/debuginfo-tests))
+       (NOT ${entry} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR}/cross-project-tests))
       get_filename_component(entry_name "${entry}" NAME)
       add_llvm_external_project(${entry_name})
     endif()
@@ -45,5 +45,5 @@ add_llvm_external_project(parallel-libs)
 add_llvm_external_project(openmp)
 
 if(LLVM_INCLUDE_TESTS)
-  add_llvm_external_project(debuginfo-tests)
+  add_llvm_external_project(cross-project-tests)
 endif()