[cfe-commits] r82726 - in /cfe/trunk/test/CodeCompletion: enum-switch-case-qualified.cpp enum-switch-case.c enum-switch-case.cpp namespace-alias.cpp namespace.cpp ordinary-name.c truncation.c using-namespace.cpp using.cpp

Douglas Gregor dgregor at apple.com
Thu Sep 24 15:57:42 PDT 2009


Author: dgregor
Date: Thu Sep 24 17:57:42 2009
New Revision: 82726

URL: http://llvm.org/viewvc/llvm-project?rev=82726&view=rev
Log:
Clean up the CodeCompletion testsuite's use of FileCheck

Modified:
    cfe/trunk/test/CodeCompletion/enum-switch-case-qualified.cpp
    cfe/trunk/test/CodeCompletion/enum-switch-case.c
    cfe/trunk/test/CodeCompletion/enum-switch-case.cpp
    cfe/trunk/test/CodeCompletion/namespace-alias.cpp
    cfe/trunk/test/CodeCompletion/namespace.cpp
    cfe/trunk/test/CodeCompletion/ordinary-name.c
    cfe/trunk/test/CodeCompletion/truncation.c
    cfe/trunk/test/CodeCompletion/using-namespace.cpp
    cfe/trunk/test/CodeCompletion/using.cpp

Modified: cfe/trunk/test/CodeCompletion/enum-switch-case-qualified.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeCompletion/enum-switch-case-qualified.cpp?rev=82726&r1=82725&r2=82726&view=diff

==============================================================================
--- cfe/trunk/test/CodeCompletion/enum-switch-case-qualified.cpp (original)
+++ cfe/trunk/test/CodeCompletion/enum-switch-case-qualified.cpp Thu Sep 24 17:57:42 2009
@@ -23,11 +23,11 @@
   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
       

Modified: cfe/trunk/test/CodeCompletion/enum-switch-case.c
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeCompletion/enum-switch-case.c?rev=82726&r1=82725&r2=82726&view=diff

==============================================================================
--- cfe/trunk/test/CodeCompletion/enum-switch-case.c (original)
+++ cfe/trunk/test/CodeCompletion/enum-switch-case.c Thu Sep 24 17:57:42 2009
@@ -21,9 +21,9 @@
       
     // 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
       

Modified: cfe/trunk/test/CodeCompletion/enum-switch-case.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeCompletion/enum-switch-case.cpp?rev=82726&r1=82725&r2=82726&view=diff

==============================================================================
--- cfe/trunk/test/CodeCompletion/enum-switch-case.cpp (original)
+++ cfe/trunk/test/CodeCompletion/enum-switch-case.cpp Thu Sep 24 17:57:42 2009
@@ -21,9 +21,9 @@
   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

Modified: cfe/trunk/test/CodeCompletion/namespace-alias.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeCompletion/namespace-alias.cpp?rev=82726&r1=82725&r2=82726&view=diff

==============================================================================
--- cfe/trunk/test/CodeCompletion/namespace-alias.cpp (original)
+++ cfe/trunk/test/CodeCompletion/namespace-alias.cpp Thu Sep 24 17:57:42 2009
@@ -16,6 +16,6 @@
   // 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
+  

Modified: cfe/trunk/test/CodeCompletion/namespace.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeCompletion/namespace.cpp?rev=82726&r1=82725&r2=82726&view=diff

==============================================================================
--- cfe/trunk/test/CodeCompletion/namespace.cpp (original)
+++ cfe/trunk/test/CodeCompletion/namespace.cpp Thu Sep 24 17:57:42 2009
@@ -10,6 +10,6 @@
   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
   

Modified: cfe/trunk/test/CodeCompletion/ordinary-name.c
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeCompletion/ordinary-name.c?rev=82726&r1=82725&r2=82726&view=diff

==============================================================================
--- cfe/trunk/test/CodeCompletion/ordinary-name.c (original)
+++ cfe/trunk/test/CodeCompletion/ordinary-name.c Thu Sep 24 17:57:42 2009
@@ -4,8 +4,9 @@
 
 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

Modified: cfe/trunk/test/CodeCompletion/truncation.c
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeCompletion/truncation.c?rev=82726&r1=82725&r2=82726&view=diff

==============================================================================
--- cfe/trunk/test/CodeCompletion/truncation.c (original)
+++ cfe/trunk/test/CodeCompletion/truncation.c Thu Sep 24 17:57:42 2009
@@ -4,7 +4,7 @@
 
 // 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

Modified: cfe/trunk/test/CodeCompletion/using-namespace.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeCompletion/using-namespace.cpp?rev=82726&r1=82725&r2=82726&view=diff

==============================================================================
--- cfe/trunk/test/CodeCompletion/using-namespace.cpp (original)
+++ cfe/trunk/test/CodeCompletion/using-namespace.cpp Thu Sep 24 17:57:42 2009
@@ -17,5 +17,5 @@
     // CHECK-CC1: I4 : 2
     // CHECK-CC1: I5 : 2
     // CHECK-CC1: N2 : 4
-    // CHECK-NEXT-CC1: N4 : 4
+    // CHECK-CC1-NEXT: N4 : 4
     // RUN: true

Modified: cfe/trunk/test/CodeCompletion/using.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeCompletion/using.cpp?rev=82726&r1=82725&r2=82726&view=diff

==============================================================================
--- cfe/trunk/test/CodeCompletion/using.cpp (original)
+++ cfe/trunk/test/CodeCompletion/using.cpp Thu Sep 24 17:57:42 2009
@@ -20,6 +20,6 @@
     // CHECK-CC1: I5 : 2
     // CHECK-CC1: N2 : 4
     // CHECK-CC1: N3 : 4
-    // CHECK-NEXT-CC1: N4 : 4
+    // CHECK-CC1-NEXT: N4 : 4
     // RUN: true
 





More information about the cfe-commits mailing list