3 files changed, 15 insertions, 6 deletions
diff --git a/clang/test/Modules/Inputs/Modified/B.h b/clang/test/Modules/Inputs/Modified/B.h
index d1c8bb5e8e1..f50dd80ca4e 100644
--- a/clang/test/Modules/Inputs/Modified/B.h
+++ b/clang/test/Modules/Inputs/Modified/B.h
@@ -1,2 +1,3 @@
-#include "A.h"
+@import A;
+
 int getB();
diff --git a/clang/test/Modules/Inputs/Modified/module.map b/clang/test/Modules/Inputs/Modified/module.map
index d9aed01430c..50aaebc5c75 100644
--- a/clang/test/Modules/Inputs/Modified/module.map
+++ b/clang/test/Modules/Inputs/Modified/module.map
@@ -1,2 +1,5 @@
 module A { header "A.h" }
-module B { header "B.h" }
+module B { 
+  header "B.h" 
+  export *
+}
diff --git a/clang/test/Modules/modify-module.m b/clang/test/Modules/modify-module.m
index 7433e6f7a27..decd07de080 100644
--- a/clang/test/Modules/modify-module.m
+++ b/clang/test/Modules/modify-module.m
@@ -6,12 +6,17 @@
 // RUN: cp %S/Inputs/Modified/A.h %t/include
 // RUN: cp %S/Inputs/Modified/B.h %t/include
 // RUN: cp %S/Inputs/Modified/module.map %t/include
-// RUN: %clang_cc1 -fmodules-cache-path=%t/cache -fmodules -I %t/include %s -verify
-// expected-no-diagnostics
+// RUN: %clang_cc1 -fdisable-module-hash -fmodules-cache-path=%t/cache -fmodules -I %t/include %s -verify
 // RUN: echo '' >> %t/include/B.h
-// RUN: %clang_cc1 -fmodules-cache-path=%t/cache -fmodules -I %t/include %s -verify
+// RUN: %clang_cc1 -fdisable-module-hash -fmodules-cache-path=%t/cache -fmodules -I %t/include %s -verify
 // RUN: echo 'int getA(); int getA2();' > %t/include/A.h
-// RUN: %clang_cc1 -fmodules-cache-path=%t/cache -fmodules -I %t/include %s -verify
+// RUN: %clang_cc1 -fdisable-module-hash -fmodules-cache-path=%t/cache -fmodules -I %t/include %s -verify
+// RUN: rm %t/cache/A.pcm
+// RUN: %clang_cc1 -fdisable-module-hash -fmodules-cache-path=%t/cache -fmodules -I %t/include %s -verify
+// RUN: touch %t/cache/A.pcm
+// RUN: %clang_cc1 -fdisable-module-hash -fmodules-cache-path=%t/cache -fmodules -I %t/include %s -verify
+
+// expected-no-diagnostics
 
 // FIXME: It is intended to suppress this on win32.
 // REQUIRES: ansi-escape-sequences