Index: tools/clang/test/Modules/Inputs/category_right.h
==================================================================
--- tools/clang/test/Modules/Inputs/category_right.h
+++ tools/clang/test/Modules/Inputs/category_right.h
@@ -6,7 +6,7 @@
 
 @interface Foo(Right2)
 -(void)right2;
 @end
 
-@interface Foo(Duplicate) // expected-warning {{duplicate definition of category}}
+@interface Foo(Duplicate)
 @end

Index: tools/clang/test/Modules/lookup.cpp
==================================================================
--- tools/clang/test/Modules/lookup.cpp
+++ tools/clang/test/Modules/lookup.cpp
@@ -2,10 +2,12 @@
 #define import @__experimental_modules_import
 import lookup_left_cxx;
 #undef import
 #define IMPORT(X) @__experimental_modules_import X
 IMPORT(lookup_right_cxx);
+
+// in lookup_left.hpp: expected-warning@3 {{weak identifier 'weak_identifier' never declared}}
 
 void test(int i, float f) {
   // unqualified lookup
   f0(&i);
   f0(&f);

Index: tools/clang/test/Modules/objc-categories.m
==================================================================
--- tools/clang/test/Modules/objc-categories.m
+++ tools/clang/test/Modules/objc-categories.m
@@ -10,10 +10,11 @@
 
 
 
 
 // in category_left.h: expected-note {{previous definition}}
+// in category_right.h: expected-warning@11 {{duplicate definition of category}}
 
 @interface Foo(Source)
 -(void)source; 
 @end