From 9fb4bf4d57b01933f50ac1cdd8eddf9ec7005412 Mon Sep 17 00:00:00 2001 From: Douglas Gregor Date: Thu, 24 Sep 2009 22:57:42 +0000 Subject: [PATCH] Clean up the CodeCompletion testsuite's use of FileCheck llvm-svn: 82726 --- .../CodeCompletion/enum-switch-case-qualified.cpp | 14 +++++++------- clang/test/CodeCompletion/enum-switch-case.c | 8 ++++---- clang/test/CodeCompletion/enum-switch-case.cpp | 8 ++++---- clang/test/CodeCompletion/namespace-alias.cpp | 4 ++-- clang/test/CodeCompletion/namespace.cpp | 2 +- clang/test/CodeCompletion/ordinary-name.c | 7 ++++--- clang/test/CodeCompletion/truncation.c | 2 +- clang/test/CodeCompletion/using-namespace.cpp | 2 +- clang/test/CodeCompletion/using.cpp | 2 +- 9 files changed, 25 insertions(+), 24 deletions(-) diff --git a/clang/test/CodeCompletion/enum-switch-case-qualified.cpp b/clang/test/CodeCompletion/enum-switch-case-qualified.cpp index 468a4f979f7c..223aca8b9323 100644 --- a/clang/test/CodeCompletion/enum-switch-case-qualified.cpp +++ b/clang/test/CodeCompletion/enum-switch-case-qualified.cpp @@ -23,11 +23,11 @@ void test(enum N::C::Color color) { case // RUN: clang-cc -fsyntax-only -code-completion-at=%s:23:8 %s -o - | FileCheck -check-prefix=CC1 %s && // RUN: true - // CHECK-NEXT-CC1: Blue : 0 : N::C::Blue - // CHECK-NEXT-CC1: Green : 0 : N::C::Green - // CHECK-NEXT-CC1: Indigo : 0 : N::C::Indigo - // CHECK-NEXT-CC1: Orange : 0 : N::C::Orange - // CHECK-NEXT-CC1: Red : 0 : N::C::Red - // CHECK-NEXT-CC1: Violet : 0 : N::C::Violet - // CHECK-NEXT-CC1: Yellow : 0 : N::C::Yellow + // CHECK-CC1: Blue : 0 : N::C::Blue + // CHECK-CC1-NEXT: Green : 0 : N::C::Green + // CHECK-CC1-NEXT: Indigo : 0 : N::C::Indigo + // CHECK-CC1-NEXT: Orange : 0 : N::C::Orange + // CHECK-CC1-NEXT: Red : 0 : N::C::Red + // CHECK-CC1-NEXT: Violet : 0 : N::C::Violet + // CHECK-CC1: Yellow : 0 : N::C::Yellow diff --git a/clang/test/CodeCompletion/enum-switch-case.c b/clang/test/CodeCompletion/enum-switch-case.c index 255fbbce2de9..d8bb5e8ca474 100644 --- a/clang/test/CodeCompletion/enum-switch-case.c +++ b/clang/test/CodeCompletion/enum-switch-case.c @@ -21,9 +21,9 @@ void test(enum Color color) { // RUN: clang-cc -fsyntax-only -code-completion-at=%s:19:10 %s -o - | FileCheck -check-prefix=CC1 %s && // CHECK-CC1: Blue : 0 - // CHECK-NEXT-CC1: Green : 0 - // CHECK-NEXT-CC1: Indigo : 0 - // CHECK-NEXT-CC1: Orange : 0 - // CHECK-NEXT-CC1: Violet : 0 + // CHECK-CC1-NEXT: Green : 0 + // CHECK-CC1-NEXT: Indigo : 0 + // CHECK-CC1-NEXT: Orange : 0 + // CHECK-CC1-NEXT: Violet : 0 // RUN: true diff --git a/clang/test/CodeCompletion/enum-switch-case.cpp b/clang/test/CodeCompletion/enum-switch-case.cpp index 15e50fdf4843..7a388fce0e39 100644 --- a/clang/test/CodeCompletion/enum-switch-case.cpp +++ b/clang/test/CodeCompletion/enum-switch-case.cpp @@ -21,9 +21,9 @@ void test(enum N::Color color) { case // RUN: clang-cc -fsyntax-only -code-completion-at=%s:21:8 %s -o - | FileCheck -check-prefix=CC1 %s && // CHECK-CC1: Blue : 0 : N::Blue - // CHECK-NEXT-CC1: Green : 0 : N::Green - // CHECK-NEXT-CC1: Indigo : 0 : N::Indigo - // CHECK-NEXT-CC1: Orange : 0 : N::Orange - // CHECK-NEXT-CC1: Violet : 0 : N::Violet + // CHECK-CC1-NEXT: Green : 0 : N::Green + // CHECK-CC1-NEXT: Indigo : 0 : N::Indigo + // CHECK-CC1-NEXT: Orange : 0 : N::Orange + // CHECK-CC1-NEXT: Violet : 0 : N::Violet // RUN: true diff --git a/clang/test/CodeCompletion/namespace-alias.cpp b/clang/test/CodeCompletion/namespace-alias.cpp index c92e554e5fc6..0fa2ec20209c 100644 --- a/clang/test/CodeCompletion/namespace-alias.cpp +++ b/clang/test/CodeCompletion/namespace-alias.cpp @@ -16,6 +16,6 @@ namespace N2 { // CHECK-CC1: I4 : 1 // CHECK-CC1: I5 : 1 // CHECK-CC1: N2 : 3 - // CHECK-NEXT-CC1: N4 : 3 + // CHECK-CC1-NEXT: N4 : 3 // RUN: true - \ No newline at end of file + diff --git a/clang/test/CodeCompletion/namespace.cpp b/clang/test/CodeCompletion/namespace.cpp index 5563698e9346..d4ed639f8a05 100644 --- a/clang/test/CodeCompletion/namespace.cpp +++ b/clang/test/CodeCompletion/namespace.cpp @@ -10,6 +10,6 @@ namespace N2 { namespace // RUN: clang-cc -fsyntax-only -code-completion-at=%s:10:12 %s -o - | FileCheck -check-prefix=CC1 %s && // CHECK-CC1: I1 : 0 - // CHECK-NEXT-CC1: I5 : 0 + // CHECK-CC1-NEXT: I5 : 0 // RUN: true diff --git a/clang/test/CodeCompletion/ordinary-name.c b/clang/test/CodeCompletion/ordinary-name.c index caba130f8b68..fb45477de104 100644 --- a/clang/test/CodeCompletion/ordinary-name.c +++ b/clang/test/CodeCompletion/ordinary-name.c @@ -4,8 +4,9 @@ typedef struct X TYPEDEF; void foo() { int y; - // CHECK-CC1: y : 0 - // CHECK-NEXT-CC1: TYPEDEF : 2 - // CHECK-NEXT-CC1: foo : 2 // RUN: clang-cc -fsyntax-only -code-completion-at=%s:6:9 %s -o - | FileCheck -check-prefix=CC1 %s && + // CHECK-CC1: y : 0 + // CHECK-CC1-NEXT: TYPEDEF : 2 + // CHECK-CC1-NOT: X + // CHECK-CC1: foo : 2 // RUN: true diff --git a/clang/test/CodeCompletion/truncation.c b/clang/test/CodeCompletion/truncation.c index b64b06658616..b72aa7facf79 100644 --- a/clang/test/CodeCompletion/truncation.c +++ b/clang/test/CodeCompletion/truncation.c @@ -4,7 +4,7 @@ struct // RUN: clang-cc -fsyntax-only -code-completion-at=%s.h:4:8 -o - %s | FileCheck -check-prefix=CC1 %s && // CHECK-CC1: X : 1 -// CHECK-NEXT-CC1: Y : 1 +// CHECK-CC1-NEXT: Y : 1 // RUN: clang-cc -fsyntax-only -code-completion-at=%s:3:8 -o - %s | FileCheck -check-prefix=CC2 %s && // CHECK-CC2: X : 1 // CHECK-CC2: Xa : 1 diff --git a/clang/test/CodeCompletion/using-namespace.cpp b/clang/test/CodeCompletion/using-namespace.cpp index 3e8cd53723e9..a332b880074e 100644 --- a/clang/test/CodeCompletion/using-namespace.cpp +++ b/clang/test/CodeCompletion/using-namespace.cpp @@ -17,5 +17,5 @@ namespace N2 { // CHECK-CC1: I4 : 2 // CHECK-CC1: I5 : 2 // CHECK-CC1: N2 : 4 - // CHECK-NEXT-CC1: N4 : 4 + // CHECK-CC1-NEXT: N4 : 4 // RUN: true diff --git a/clang/test/CodeCompletion/using.cpp b/clang/test/CodeCompletion/using.cpp index dac556e151a7..57b3aa7880a2 100644 --- a/clang/test/CodeCompletion/using.cpp +++ b/clang/test/CodeCompletion/using.cpp @@ -20,6 +20,6 @@ namespace N2 { // CHECK-CC1: I5 : 2 // CHECK-CC1: N2 : 4 // CHECK-CC1: N3 : 4 - // CHECK-NEXT-CC1: N4 : 4 + // CHECK-CC1-NEXT: N4 : 4 // RUN: true