From bf0738b201fbd5fcc739b768a6d37a437e0e2b5b Mon Sep 17 00:00:00 2001 From: David Blaikie Date: Sun, 29 May 2016 19:50:23 +0000 Subject: [PATCH] Enable some accidentally dead tests and fix up the bitrot Problem found by Nico, originally committed by me in r213213. The .test prefix wasn't actually being run. Once that was fixed the test cases had outdated command line syntax and IR debug info format, so updated for those issues to get them back up and running. Thanks Nico! git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@271188 91177308-0d34-0410-b5e6-96231b3b80d8 --- test/CodeGenCXX/Inputs/debug-info-class-limited.cpp | 11 +++++++---- test/CodeGenCXX/debug-info-class-limited-plugin.test | 2 +- test/CodeGenCXX/debug-info-class-limited.test | 2 +- test/lit.cfg | 2 +- 4 files changed, 10 insertions(+), 7 deletions(-) diff --git a/test/CodeGenCXX/Inputs/debug-info-class-limited.cpp b/test/CodeGenCXX/Inputs/debug-info-class-limited.cpp index 17fa456a45..34a1cfa00e 100644 --- a/test/CodeGenCXX/Inputs/debug-info-class-limited.cpp +++ b/test/CodeGenCXX/Inputs/debug-info-class-limited.cpp @@ -1,5 +1,6 @@ -// CHECK-DAG: !DICompositeType(tag: DW_TAG_structure_type, name: "PR16214",{{.*}} line: [[@LINE+1]],{{.*}} isDefinition: true +// CHECK: !DICompositeType(tag: DW_TAG_structure_type, name: "PR16214",{{.*}} line: [[@LINE+2]],{{.*}} +// CHECK-NOT: DIFlagFwdDecl struct PR16214 { int i; }; @@ -10,7 +11,8 @@ bar *a; bar b; namespace PR14467 { -// CHECK-DAG: !DICompositeType(tag: DW_TAG_structure_type, name: "foo",{{.*}} line: [[@LINE+1]],{{.*}} isDefinition: true +// CHECK: !DICompositeType(tag: DW_TAG_structure_type, name: "foo",{{.*}} line: [[@LINE+2]],{{.*}} +// CHECK-NOT: DIFlagFwdDecl struct foo { }; @@ -21,7 +23,7 @@ foo *bar(foo *a) { } namespace test1 { -// CHECK-DAG: !DICompositeType(tag: DW_TAG_structure_type, name: "foo",{{.*}} line: [[@LINE+1]],{{.*}} isDefinition: true +// CHECK: !DICompositeType(tag: DW_TAG_structure_type, name: "foo",{{.*}} line: [[@LINE+1]],{{.*}} flags: DIFlagFwdDecl struct foo { }; @@ -35,7 +37,8 @@ namespace test2 { // FIXME: if we were a bit fancier, we could realize that the 'foo' type is only // required because of the 'bar' type which is not required at all (or might // only be required to be declared) -// CHECK-DAG: !DICompositeType(tag: DW_TAG_structure_type, name: "foo",{{.*}} line: [[@LINE+1]],{{.*}} isDefinition: true +// CHECK: !DICompositeType(tag: DW_TAG_structure_type, name: "foo",{{.*}} line: [[@LINE+2]],{{.*}} +// CHECK-NOT: DIFlagFwdDecl struct foo { }; diff --git a/test/CodeGenCXX/debug-info-class-limited-plugin.test b/test/CodeGenCXX/debug-info-class-limited-plugin.test index 61d258d9ff..533c2f6b16 100644 --- a/test/CodeGenCXX/debug-info-class-limited-plugin.test +++ b/test/CodeGenCXX/debug-info-class-limited-plugin.test @@ -1,2 +1,2 @@ -RUN: %clang_cc1 -emit-llvm -fno-standalone-debug -g -o - -load %llvmshlibdir/PrintFunctionNames%pluginext -add-plugin print-function-names %S/Inputs/debug-info-class-limited.cpp 2>&1 | FileCheck %S/Inputs/debug-info-class-limited.cpp +RUN: %clang_cc1 -emit-llvm -debug-info-kind=limited -o - -load %llvmshlibdir/PrintFunctionNames%pluginext -add-plugin print-function-names %S/Inputs/debug-info-class-limited.cpp 2>&1 | FileCheck %S/Inputs/debug-info-class-limited.cpp REQUIRES: plugins, examples diff --git a/test/CodeGenCXX/debug-info-class-limited.test b/test/CodeGenCXX/debug-info-class-limited.test index 0b10728f3c..c2e332866f 100644 --- a/test/CodeGenCXX/debug-info-class-limited.test +++ b/test/CodeGenCXX/debug-info-class-limited.test @@ -1 +1 @@ -RUN: %clang_cc1 -emit-llvm -fno-standalone-debug -g %S/Inputs/debug-info-class-limited.cpp -o - | FileCheck %S/Inputs/debug-info-class-limited.cpp +RUN: %clang_cc1 -emit-llvm -debug-info-kind=limited %S/Inputs/debug-info-class-limited.cpp -o - | FileCheck %S/Inputs/debug-info-class-limited.cpp diff --git a/test/lit.cfg b/test/lit.cfg index e216634268..064271d153 100644 --- a/test/lit.cfg +++ b/test/lit.cfg @@ -44,7 +44,7 @@ else: config.test_format = lit.formats.ShTest(execute_external) # suffixes: A list of file extensions to treat as test files. -config.suffixes = ['.c', '.cpp', '.m', '.mm', '.cu', '.ll', '.cl', '.s', '.S', '.modulemap'] +config.suffixes = ['.c', '.cpp', '.m', '.mm', '.cu', '.ll', '.cl', '.s', '.S', '.modulemap', '.test'] # excludes: A list of directories to exclude from the testsuite. The 'Inputs' # subdirectories contain auxiliary inputs for various tests in their parent -- 2.40.0