3 files changed, 13 insertions, 0 deletions
diff --git a/clang/test/Modules/Inputs/module.map b/clang/test/Modules/Inputs/module.map
index 5a95ce9edc0..65c75fdc1c6 100644
--- a/clang/test/Modules/Inputs/module.map
+++ b/clang/test/Modules/Inputs/module.map
@@ -217,3 +217,7 @@ module linkage_merge {
 module incomplete_mod {
   header "incomplete_mod.h"
 }
+
+module warning {
+  header "warning.h"
+}
diff --git a/clang/test/Modules/Inputs/warning.h b/clang/test/Modules/Inputs/warning.h
new file mode 100644
index 00000000000..a90c6288674
--- /dev/null
+++ b/clang/test/Modules/Inputs/warning.h
@@ -0,0 +1 @@
+enum { bigger_than_int = 0x80000000 };
diff --git a/clang/test/Modules/system_headers.m b/clang/test/Modules/system_headers.m
new file mode 100644
index 00000000000..39b13ca5fc4
--- /dev/null
+++ b/clang/test/Modules/system_headers.m
@@ -0,0 +1,8 @@
+// Test that system-headerness works for building modules.
+
+// RUN: rm -rf %t
+// RUN: %clang_cc1 -fmodules -fmodules-cache-path=%t/cache -isystem %S/Inputs -pedantic -Werror %s -verify
+// expected-no-diagnostics
+
+@import warning;
+int i = bigger_than_int;