Re-revert "Refactor debuginfo-tests."

This is still breaking greendragon. At this point I give up until someone can fix the greendragon bots, and I will probably abandon this effort in favor of using a private github repository. llvm-svn: 318722
dabrahams · Nov 21, 2017 · 79708b5 · 79708b5
1 parent f874bd6
commit 79708b5
Show file tree

Hide file tree

Showing 28 changed files with 29 additions and 174 deletions.
diff --git a/clang/test/CMakeLists.txt b/clang/test/CMakeLists.txt
@@ -88,14 +88,6 @@ set(CLANG_TEST_PARAMS
   clang_site_config=${CMAKE_CURRENT_BINARY_DIR}/lit.site.cfg
   )
 
-if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/debuginfo-tests/CMakeLists.txt")
-  # This is a hack to keep existing build build infrastructure working while we
-  # can migrate to the new standard workflow of checking out debuginfo-tests into
-  # llvm/projects or using it in a mono-repo
-  set(DEBUGINFO_TESTS_EXCLUDE_FROM_ALL ON)
-  add_subdirectory(debuginfo-tests)
-endif()
-
 if( NOT CLANG_BUILT_STANDALONE )
   list(APPEND CLANG_TEST_DEPS
     llvm-config

diff --git a/clang/test/lit.cfg.py b/clang/test/lit.cfg.py
@@ -58,6 +58,8 @@
 
 tools = [
     'c-index-test', 'clang-check', 'clang-diff', 'clang-format', 'opt',
+    ToolSubst('%test_debuginfo', command=os.path.join(
+        config.llvm_src_root, 'utils', 'test_debuginfo.pl')),
     ToolSubst('%clang_func_map', command=FindTool(
         'clang-func-mapping'), unresolved='ignore'),
 ]

diff --git a/debuginfo-tests/CMakeLists.txt b/debuginfo-tests/CMakeLists.txt
diff --git a/...fo-tests/tests/aggregate-indirect-arg.cpp → debuginfo-tests/aggregate-indirect-arg.cpp b/...fo-tests/tests/aggregate-indirect-arg.cpp → debuginfo-tests/aggregate-indirect-arg.cpp
@@ -1,6 +1,6 @@
 // RUN: %clangxx %target_itanium_abi_host_triple -O0 -g %s -c -o %t.o
 // RUN: %clangxx %target_itanium_abi_host_triple %t.o -o %t.out
-// RUN: %test_debuginfo %s %t.out
+// RUN: %test_debuginfo %s %t.out 
 // Radar 8945514
 // DEBUGGER: break 22
 // DEBUGGER: r

diff --git a/debuginfo-tests/tests/asan-blocks.c → debuginfo-tests/asan-blocks.c b/debuginfo-tests/tests/asan-blocks.c → debuginfo-tests/asan-blocks.c
diff --git a/debuginfo-tests/tests/asan.c → debuginfo-tests/asan.c b/debuginfo-tests/tests/asan.c → debuginfo-tests/asan.c
diff --git a/debuginfo-tests/tests/block_var.m → debuginfo-tests/block_var.m b/debuginfo-tests/tests/block_var.m → debuginfo-tests/block_var.m
@@ -1,6 +1,6 @@
 // RUN: %clang %target_itanium_abi_host_triple -O0 -g %s -c -o %t.o
 // RUN: %clang %target_itanium_abi_host_triple %t.o -o %t.out -framework Foundation
-// RUN: %test_debuginfo %s %t.out
+// RUN: %test_debuginfo %s %t.out 
 
 // REQUIRES: system-darwin
 

diff --git a/debuginfo-tests/tests/blocks.m → debuginfo-tests/blocks.m b/debuginfo-tests/tests/blocks.m → debuginfo-tests/blocks.m
@@ -1,6 +1,6 @@
 // RUN: %clang %target_itanium_abi_host_triple -O0 -g %s -c -o %t.o
 // RUN: %clang %target_itanium_abi_host_triple %t.o -o %t.out -framework Foundation
-// RUN: %test_debuginfo %s %t.out
+// RUN: %test_debuginfo %s %t.out 
 
 // REQUIRES: system-darwin
 // Radar 9279956
@@ -24,9 +24,9 @@ - (void) helper {
  int master = 0;
  __block int m2 = 0;
  __block int dbTransaction = 0;
- int (^x)(void) = ^(void) { (void) self;
-	(void) master;
-	(void) dbTransaction;
+ int (^x)(void) = ^(void) { (void) self; 
+	(void) master; 
+	(void) dbTransaction; 
 	m2++;
 	return m2;
 	};

diff --git a/debuginfo-tests/tests/ctor.cpp → debuginfo-tests/ctor.cpp b/debuginfo-tests/tests/ctor.cpp → debuginfo-tests/ctor.cpp
@@ -1,12 +1,12 @@
 // RUN: %clangxx %target_itanium_abi_host_triple -O0 -g %s -c -o %t.o
 // RUN: %clangxx %target_itanium_abi_host_triple %t.o -o %t.out
-// RUN: %test_debuginfo %s %t.out
+// RUN: %test_debuginfo %s %t.out 
 
 
 // DEBUGGER: break 14
 // DEBUGGER: r
 // DEBUGGER: p *this
-// CHECK-NEXT-NOT: Cannot access memory at address
+// CHECK-NEXT-NOT: Cannot access memory at address 
 
 class A {
 public:

diff --git a/debuginfo-tests/tests/dbg-arg.c → debuginfo-tests/dbg-arg.c b/debuginfo-tests/tests/dbg-arg.c → debuginfo-tests/dbg-arg.c
diff --git a/debuginfo-tests/tests/foreach.m → debuginfo-tests/foreach.m b/debuginfo-tests/tests/foreach.m → debuginfo-tests/foreach.m
@@ -1,6 +1,6 @@
 // RUN: %clang %target_itanium_abi_host_triple -O0 -g %s -c -o %t.o
 // RUN: %clang %target_itanium_abi_host_triple %t.o -o %t.out -framework Foundation
-// RUN: %test_debuginfo %s %t.out
+// RUN: %test_debuginfo %s %t.out 
 //
 // REQUIRES: system-darwin
 // Radar 8757124
@@ -19,7 +19,7 @@ int main (int argc, const char * argv[]) {
     for (NSString *thing in things) {
         NSLog (@"%@", thing);
     }
-
+    
     things = [NSArray arrayWithObjects:@"aaa", @"bbb", @"ccc" , nil];
     for (NSString *thing in things) {
         NSLog (@"%@", thing);

diff --git a/...nfo-tests/tests/forward-declare-class.cpp → debuginfo-tests/forward-declare-class.cpp b/...nfo-tests/tests/forward-declare-class.cpp → debuginfo-tests/forward-declare-class.cpp
diff --git a/debuginfo-tests/lit.cfg.py b/debuginfo-tests/lit.cfg.py
diff --git a/debuginfo-tests/tests/lit.local.cfg → debuginfo-tests/lit.local.cfg b/debuginfo-tests/tests/lit.local.cfg → debuginfo-tests/lit.local.cfg
diff --git a/debuginfo-tests/lit.site.cfg.py.in b/debuginfo-tests/lit.site.cfg.py.in
diff --git a/debuginfo-tests/tests/llgdb.py → debuginfo-tests/llgdb.py b/debuginfo-tests/tests/llgdb.py → debuginfo-tests/llgdb.py
diff --git a/debuginfo-tests/tests/nested-struct.cpp → debuginfo-tests/nested-struct.cpp b/debuginfo-tests/tests/nested-struct.cpp → debuginfo-tests/nested-struct.cpp
diff --git a/debuginfo-tests/tests/nrvo-string.cpp → debuginfo-tests/nrvo-string.cpp b/debuginfo-tests/tests/nrvo-string.cpp → debuginfo-tests/nrvo-string.cpp
diff --git a/debuginfo-tests/tests/safestack.c → debuginfo-tests/safestack.c b/debuginfo-tests/tests/safestack.c → debuginfo-tests/safestack.c
diff --git a/debuginfo-tests/tests/sret.cpp → debuginfo-tests/sret.cpp b/debuginfo-tests/tests/sret.cpp → debuginfo-tests/sret.cpp
@@ -1,6 +1,6 @@
 // RUN: %clangxx %target_itanium_abi_host_triple -O0 -g %s -c -o %t.o
 // RUN: %clangxx %target_itanium_abi_host_triple %t.o -o %t.out
-// RUN: %test_debuginfo %s %t.out
+// RUN: %test_debuginfo %s %t.out 
 // Radar 8775834
 // DEBUGGER: break 62
 // DEBUGGER: r
@@ -24,7 +24,7 @@ class A
     int m_int;
 };
 
-A::A (int i) :
+A::A (int i) : 
     m_int(i)
 {
 }
@@ -50,11 +50,11 @@ class B
 {
 public:
     B () {}
-
+    
     A AInstance();
 };
 
-A
+A 
 B::AInstance()
 {
     A a(12);
@@ -65,7 +65,7 @@ int main (int argc, char const *argv[])
 {
     B b;
     int return_val = b.AInstance().get_int();
-
+    
     A a(b.AInstance());
     return return_val;
 }
diff --git a/debuginfo-tests/tests/stack-var.c → debuginfo-tests/stack-var.c b/debuginfo-tests/tests/stack-var.c → debuginfo-tests/stack-var.c
diff --git a/debuginfo-tests/tests/static-member-2.cpp → debuginfo-tests/static-member-2.cpp b/debuginfo-tests/tests/static-member-2.cpp → debuginfo-tests/static-member-2.cpp
diff --git a/debuginfo-tests/tests/static-member.cpp → debuginfo-tests/static-member.cpp b/debuginfo-tests/tests/static-member.cpp → debuginfo-tests/static-member.cpp
diff --git a/debuginfo-tests/tests/vla.c → debuginfo-tests/vla.c b/debuginfo-tests/tests/vla.c → debuginfo-tests/vla.c
@@ -1,7 +1,7 @@
 // This test case verifies the debug location for variable-length arrays.
 // RUN: %clang %target_itanium_abi_host_triple -O0 -g %s -c -o %t.o
 // RUN: %clang %target_itanium_abi_host_triple %t.o -o %t.out
-// RUN: %test_debuginfo %s %t.out
+// RUN: %test_debuginfo %s %t.out 
 //
 // DEBUGGER: break 18
 // DEBUGGER: r

diff --git a/llvm/CMakeLists.txt b/llvm/CMakeLists.txt
@@ -110,7 +110,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;libcxx;libcxxabi;lldb;compiler-rt;debuginfo-tests;lld;polly")
+set(LLVM_ALL_PROJECTS "clang;libcxx;libcxxabi;lldb;compiler-rt;lld;polly")
 set(LLVM_ENABLE_PROJECTS "" CACHE STRING
 	"Semicolon-separated list of projects to build (${LLVM_ALL_PROJECTS}), or \"all\".")
 if( LLVM_ENABLE_PROJECTS STREQUAL "all" )
@@ -885,18 +885,13 @@ if( LLVM_INCLUDE_EXAMPLES )
 endif()
 
 if( LLVM_INCLUDE_TESTS )
-  if(TARGET clang)
+  if(EXISTS ${LLVM_MAIN_SRC_DIR}/projects/test-suite AND TARGET clang)
     include(LLVMExternalProjectUtils)
-    if (EXISTS ${LLVM_MAIN_SRC_DIR}/projects/test-suite)
-      llvm_ExternalProject_Add(test-suite ${LLVM_MAIN_SRC_DIR}/projects/test-suite
-        USE_TOOLCHAIN
-        TOOLCHAIN_TOOLS clang lld clang-cl
-        EXCLUDE_FROM_ALL
-        NO_INSTALL
-        ALWAYS_CLEAN)
-    endif()
-
-    add_llvm_external_project(debuginfo-tests projects/debuginfo-tests)
+    llvm_ExternalProject_Add(test-suite ${LLVM_MAIN_SRC_DIR}/projects/test-suite
+      USE_TOOLCHAIN
+      EXCLUDE_FROM_ALL
+      NO_INSTALL
+      ALWAYS_CLEAN)
   endif()
   add_subdirectory(utils/lit)
   add_subdirectory(test)

diff --git a/llvm/projects/CMakeLists.txt b/llvm/projects/CMakeLists.txt
@@ -10,7 +10,6 @@ foreach(entry ${entries})
        (NOT ${entry} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR}/libcxxabi) AND
        (NOT ${entry} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR}/libunwind) AND
        (NOT ${entry} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR}/test-suite) AND
-       (NOT ${entry} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR}/debuginfo-tests) AND
        (NOT ${entry} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR}/parallel-libs) AND
        (NOT ${entry} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR}/openmp))
       add_subdirectory(${entry})

diff --git a/llvm/utils/lit/lit/llvm/config.py b/llvm/utils/lit/lit/llvm/config.py
@@ -27,9 +27,8 @@ def __init__(self, lit_config, config):
             # For tests that require Windows to run.
             features.add('system-windows')
 
-            lit_tools_dir = getattr(config, 'lit_tools_dir', None)
             # Seek sane tools in directories and set to $PATH.
-            path = self.lit_config.getToolsPath(lit_tools_dir,
+            path = self.lit_config.getToolsPath(config.lit_tools_dir,
                                                 config.environment['PATH'],
                                                 ['cmp.exe', 'grep.exe', 'sed.exe'])
             if path is not None:
@@ -414,10 +413,8 @@ def use_clang(self, required=True):
             self.config.substitutions.append(
                 ('%target_itanium_abi_host_triple', ''))
 
-        clang_src_dir = getattr(self.config, 'clang_src_dir', None)
-        if clang_src_dir:
-            self.config.substitutions.append(
-                ('%src_include_dir', os.path.join(clang_src_dir, 'include')))
+        self.config.substitutions.append(
+            ('%src_include_dir', self.config.clang_src_dir + '/include'))
 
         # FIXME: Find nicer way to prohibit this.
         self.config.substitutions.append(

diff --git a/llvm/utils/test_debuginfo.pl b/llvm/utils/test_debuginfo.pl
@@ -56,7 +56,7 @@
 if (!$my_debugger) {
     if ($use_lldb) {
         my $path = dirname(Cwd::abs_path($0));
-        $my_debugger = "/usr/bin/env python $path/../tools/clang/test/debuginfo-tests/tests/llgdb.py";
+        $my_debugger = "/usr/bin/env python $path/../tools/clang/test/debuginfo-tests/llgdb.py";
     } else {
         $my_debugger = "gdb";
     }