Index: cfe/trunk/test/Analysis/cfg-rich-constructors.cpp
===================================================================
--- cfe/trunk/test/Analysis/cfg-rich-constructors.cpp
+++ cfe/trunk/test/Analysis/cfg-rich-constructors.cpp
@@ -459,7 +459,7 @@
 // TODO: Should provide construction context for the constructor,
 // even if there is no specific trigger statement here.
 // CHECK: void simpleTemporary()
-// CHECK           1: C() (CXXConstructExpr, class C)
+// CHECK:          1: C() (CXXConstructExpr, class C)
 void simpleTemporary() {
   C();
 }
Index: cfe/trunk/test/CodeGenCXX/noescape.cpp
===================================================================
--- cfe/trunk/test/CodeGenCXX/noescape.cpp
+++ cfe/trunk/test/CodeGenCXX/noescape.cpp
@@ -45,7 +45,7 @@
 }
 
 // CHECK-LABEL: define i8* @_Z5test1Pv(
-// CHECK : %call = call {{.*}} @_ZnwmPv({{.*}}, {{.*}} nocapture {{.*}})
+// CHECK: %call = call {{.*}} @_ZnwmPv({{.*}}, {{.*}} nocapture {{.*}})
 void *test1(void *p0) {
   return ::operator new(16, p0);
 }
Index: cfe/trunk/test/CodeGenObjC/externally-retained.m
===================================================================
--- cfe/trunk/test/CodeGenObjC/externally-retained.m
+++ cfe/trunk/test/CodeGenObjC/externally-retained.m
@@ -22,7 +22,7 @@
 void param(ObjTy *p) EXT_RET {
   // CHECK-LABEL: define void @param
   // CHECK-NOT: llvm.objc.
-  // CHECK ret
+  // CHECK: ret
 }
 
 void local() {
Index: compiler-rt/trunk/test/profile/instrprof-merge.c
===================================================================
--- compiler-rt/trunk/test/profile/instrprof-merge.c
+++ compiler-rt/trunk/test/profile/instrprof-merge.c
@@ -90,8 +90,8 @@
 // Not profiled
 // CHECK-LABEL:  bar:
 // CHECK:         Counters: 1
-// CHECK-NEXT     Function count: 0
-// CHECK-NEXT     Block counts: []
+// CHECK-NEXT:    Function count: 0
+// CHECK-NEXT:    Block counts: []
 
 // Not profiled
 // CHECK-LABEL:  main:
Index: llvm/trunk/test/tools/dsymutil/X86/modules.m
===================================================================
--- llvm/trunk/test/tools/dsymutil/X86/modules.m
+++ llvm/trunk/test/tools/dsymutil/X86/modules.m
@@ -116,6 +116,7 @@
 // CHECK:       DW_AT_type {{.*}}{0x{{0*}}[[PTR:.*]]}
 //
 // CHECK: 0x{{0*}}[[PTR]]: DW_TAG_pointer_type
+// FIXME: The next line doesn't work.
 // CHECK-NEXT   DW_AT_type [DW_FORM_ref_addr] {0x{{0*}}[[INTERFACE]]
 extern int odr_violation;
 
Index: llvm/trunk/test/tools/dsymutil/X86/odr-fwd-declaration.cpp
===================================================================
--- llvm/trunk/test/tools/dsymutil/X86/odr-fwd-declaration.cpp
+++ llvm/trunk/test/tools/dsymutil/X86/odr-fwd-declaration.cpp
@@ -49,7 +49,7 @@
 // CHECK: AT_name{{.*}} "S"
 // CHECK-NOT: {{DW_TAG|NULL}}
 // CHECK: AT_declaration
-// CHECK-NOT AT_byte_size
+// CHECK-NOT: AT_byte_size
 
 #elif defined(FILE2)
 # 1 "Header.h" 1