24 files changed, 14 insertions, 16 deletions
diff --git a/clang/test/Modules/macro-reexport/a1.h b/clang/test/Modules/Inputs/macro-reexport/a1.h
index 39933315f7e..39933315f7e 100644
--- a/clang/test/Modules/macro-reexport/a1.h
+++ b/clang/test/Modules/Inputs/macro-reexport/a1.h
diff --git a/clang/test/Modules/macro-reexport/a2.h b/clang/test/Modules/Inputs/macro-reexport/a2.h
index e69de29bb2d..e69de29bb2d 100644
--- a/clang/test/Modules/macro-reexport/a2.h
+++ b/clang/test/Modules/Inputs/macro-reexport/a2.h
diff --git a/clang/test/Modules/macro-reexport/b1.h b/clang/test/Modules/Inputs/macro-reexport/b1.h
index e69de29bb2d..e69de29bb2d 100644
--- a/clang/test/Modules/macro-reexport/b1.h
+++ b/clang/test/Modules/Inputs/macro-reexport/b1.h
diff --git a/clang/test/Modules/macro-reexport/b2.h b/clang/test/Modules/Inputs/macro-reexport/b2.h
index 26150458d35..26150458d35 100644
--- a/clang/test/Modules/macro-reexport/b2.h
+++ b/clang/test/Modules/Inputs/macro-reexport/b2.h
diff --git a/clang/test/Modules/macro-reexport/c1.h b/clang/test/Modules/Inputs/macro-reexport/c1.h
index b63c278577f..b63c278577f 100644
--- a/clang/test/Modules/macro-reexport/c1.h
+++ b/clang/test/Modules/Inputs/macro-reexport/c1.h
diff --git a/clang/test/Modules/macro-reexport/d1.h b/clang/test/Modules/Inputs/macro-reexport/d1.h
index 99abd248159..99abd248159 100644
--- a/clang/test/Modules/macro-reexport/d1.h
+++ b/clang/test/Modules/Inputs/macro-reexport/d1.h
diff --git a/clang/test/Modules/macro-reexport/d2.h b/clang/test/Modules/Inputs/macro-reexport/d2.h
index 688f2d98a13..688f2d98a13 100644
--- a/clang/test/Modules/macro-reexport/d2.h
+++ b/clang/test/Modules/Inputs/macro-reexport/d2.h
diff --git a/clang/test/Modules/macro-reexport/e1.h b/clang/test/Modules/Inputs/macro-reexport/e1.h
index 6c6829df365..6c6829df365 100644
--- a/clang/test/Modules/macro-reexport/e1.h
+++ b/clang/test/Modules/Inputs/macro-reexport/e1.h
diff --git a/clang/test/Modules/macro-reexport/e2.h b/clang/test/Modules/Inputs/macro-reexport/e2.h
index 7bc0b4972d2..7bc0b4972d2 100644
--- a/clang/test/Modules/macro-reexport/e2.h
+++ b/clang/test/Modules/Inputs/macro-reexport/e2.h
diff --git a/clang/test/Modules/macro-reexport/f1.h b/clang/test/Modules/Inputs/macro-reexport/f1.h
index f8f6502a90c..f8f6502a90c 100644
--- a/clang/test/Modules/macro-reexport/f1.h
+++ b/clang/test/Modules/Inputs/macro-reexport/f1.h
diff --git a/clang/test/Modules/macro-reexport/module.modulemap b/clang/test/Modules/Inputs/macro-reexport/module.modulemap
index 896bda041c3..896bda041c3 100644
--- a/clang/test/Modules/macro-reexport/module.modulemap
+++ b/clang/test/Modules/Inputs/macro-reexport/module.modulemap
diff --git a/clang/test/Modules/redecls/a.h b/clang/test/Modules/Inputs/redecls/a.h
index 1647f86606a..1647f86606a 100644
--- a/clang/test/Modules/redecls/a.h
+++ b/clang/test/Modules/Inputs/redecls/a.h
diff --git a/clang/test/Modules/redecls/b.h b/clang/test/Modules/Inputs/redecls/b.h
index d41573ddc78..d41573ddc78 100644
--- a/clang/test/Modules/redecls/b.h
+++ b/clang/test/Modules/Inputs/redecls/b.h
diff --git a/clang/test/Modules/redecls/module.map b/clang/test/Modules/Inputs/redecls/module.map
index a36568207b6..a36568207b6 100644
--- a/clang/test/Modules/redecls/module.map
+++ b/clang/test/Modules/Inputs/redecls/module.map
diff --git a/clang/test/Modules/self-import-header/af.framework/Headers/a1.h b/clang/test/Modules/Inputs/self-import-header/af.framework/Headers/a1.h
index 31ae279bde2..31ae279bde2 100644
--- a/clang/test/Modules/self-import-header/af.framework/Headers/a1.h
+++ b/clang/test/Modules/Inputs/self-import-header/af.framework/Headers/a1.h
diff --git a/clang/test/Modules/self-import-header/af.framework/Headers/a2.h b/clang/test/Modules/Inputs/self-import-header/af.framework/Headers/a2.h
index cc7e6e20b66..cc7e6e20b66 100644
--- a/clang/test/Modules/self-import-header/af.framework/Headers/a2.h
+++ b/clang/test/Modules/Inputs/self-import-header/af.framework/Headers/a2.h
diff --git a/clang/test/Modules/self-import-header/af.framework/module.map b/clang/test/Modules/Inputs/self-import-header/af.framework/module.map
index 87176831df2..87176831df2 100644
--- a/clang/test/Modules/self-import-header/af.framework/module.map
+++ b/clang/test/Modules/Inputs/self-import-header/af.framework/module.map
diff --git a/clang/test/Modules/self-import-header/depend_builtin/h1.h b/clang/test/Modules/Inputs/self-import-header/depend_builtin/h1.h
index 13298efce87..13298efce87 100644
--- a/clang/test/Modules/self-import-header/depend_builtin/h1.h
+++ b/clang/test/Modules/Inputs/self-import-header/depend_builtin/h1.h
diff --git a/clang/test/Modules/self-import-header/depend_builtin/module.map b/clang/test/Modules/Inputs/self-import-header/depend_builtin/module.map
index a736ad85c13..a736ad85c13 100644
--- a/clang/test/Modules/self-import-header/depend_builtin/module.map
+++ b/clang/test/Modules/Inputs/self-import-header/depend_builtin/module.map
diff --git a/clang/test/Modules/dependency-gen.modulemap.cpp b/clang/test/Modules/dependency-gen.modulemap
index c49714c14ed..5cb8a4dba97 100644
--- a/clang/test/Modules/dependency-gen.modulemap.cpp
+++ b/clang/test/Modules/dependency-gen.modulemap
@@ -3,7 +3,7 @@
 // RUN: cd %S
 // RUN: rm -f %t.cpm %t-base.pcm %t-base.d %t.d
 // RUN: %clang_cc1 -I. -x c++ -fmodule-maps -fmodule-name=test-base -fno-modules-implicit-maps -fmodules -emit-module -fno-validate-pch -fmodules-strict-decluse Inputs/dependency-gen-base.modulemap -dependency-file %t-base.d -MT %t-base.pcm -o %t-base.pcm -fmodule-map-file-home-is-cwd
-// RUN: %clang_cc1 -I. -x c++ -fmodule-maps -fmodule-name=test -fno-modules-implicit-maps -fmodules -emit-module -fno-validate-pch -fmodules-strict-decluse -fmodule-file=%t-base.pcm dependency-gen.modulemap.cpp -dependency-file %t.d -MT %t.pcm -o %t.pcm -fmodule-map-file-home-is-cwd
+// RUN: %clang_cc1 -I. -x c++ -fmodule-maps -fmodule-name=test -fno-modules-implicit-maps -fmodules -emit-module -fno-validate-pch -fmodules-strict-decluse -fmodule-file=%t-base.pcm %s -dependency-file %t.d -MT %t.pcm -o %t.pcm -fmodule-map-file-home-is-cwd
 // RUN: FileCheck %s < %t.d
 module "test" {
   export *
diff --git a/clang/test/Modules/macro-reexport/macro-reexport.cpp b/clang/test/Modules/macro-reexport.cpp
index af2ec847ce0..1df49b948d3 100644
--- a/clang/test/Modules/macro-reexport/macro-reexport.cpp
+++ b/clang/test/Modules/macro-reexport.cpp
@@ -1,12 +1,12 @@
 // RUN: rm -rf %t
-// RUN: %clang_cc1 -fsyntax-only -DC1 -I. %s -fmodules-cache-path=%t -verify
-// RUN: %clang_cc1 -fsyntax-only -DC1 -I. -fmodules %s -fmodules-cache-path=%t -verify
-// RUN: %clang_cc1 -fsyntax-only -DD1 -I. %s -fmodules-cache-path=%t -verify
-// RUN: %clang_cc1 -fsyntax-only -DD1 -I. -fmodules %s -fmodules-cache-path=%t -verify
-// RUN: %clang_cc1 -fsyntax-only -DD2 -I. %s -fmodules-cache-path=%t -verify
-// RUN: %clang_cc1 -fsyntax-only -DD2 -I. -fmodules %s -fmodules-cache-path=%t -verify
-// RUN: %clang_cc1 -fsyntax-only -DF1 -I. %s -fmodules-cache-path=%t -verify
-// RUN: %clang_cc1 -fsyntax-only -DF1 -I. -fmodules %s -fmodules-cache-path=%t -verify
+// RUN: %clang_cc1 -fsyntax-only -DC1 -I%S/Inputs/macro-reexport %s -fmodules-cache-path=%t -verify
+// RUN: %clang_cc1 -fsyntax-only -DC1 -I%S/Inputs/macro-reexport -fmodules %s -fmodules-cache-path=%t -verify
+// RUN: %clang_cc1 -fsyntax-only -DD1 -I%S/Inputs/macro-reexport %s -fmodules-cache-path=%t -verify
+// RUN: %clang_cc1 -fsyntax-only -DD1 -I%S/Inputs/macro-reexport -fmodules %s -fmodules-cache-path=%t -verify
+// RUN: %clang_cc1 -fsyntax-only -DD2 -I%S/Inputs/macro-reexport %s -fmodules-cache-path=%t -verify
+// RUN: %clang_cc1 -fsyntax-only -DD2 -I%S/Inputs/macro-reexport -fmodules %s -fmodules-cache-path=%t -verify
+// RUN: %clang_cc1 -fsyntax-only -DF1 -I%S/Inputs/macro-reexport %s -fmodules-cache-path=%t -verify
+// RUN: %clang_cc1 -fsyntax-only -DF1 -I%S/Inputs/macro-reexport -fmodules %s -fmodules-cache-path=%t -verify
 
 #if defined(F1)
 #include "f1.h"
diff --git a/clang/test/Modules/redecls/main.m b/clang/test/Modules/redecls.m
index bf3788a96d8..fa643b90ac8 100644
--- a/clang/test/Modules/redecls/main.m
+++ b/clang/test/Modules/redecls.m
@@ -1,9 +1,7 @@
 // RUN: rm -rf %t.mcp
-// RUN: %clang_cc1 -fmodules -x objective-c -emit-module -fmodule-name=a %S/module.map -fmodules-cache-path=%t.mcp
-// RUN: %clang_cc1 -fmodules -x objective-c -emit-module -fmodule-name=b %S/module.map -fmodules-cache-path=%t.mcp
-// RUN: %clang_cc1 -fmodules %s -emit-pch -o %t1.pch -fmodules-cache-path=%t.mcp -I %S
-// RUN: %clang_cc1 -fmodules %s -emit-pch -o %t2.pch -include-pch %t1.pch -fmodules-cache-path=%t.mcp -I %S
-// RUN: %clang_cc1 -fmodules %s -fsyntax-only -include-pch %t2.pch -I %S -fmodules-cache-path=%t.mcp -verify
+// RUN: %clang_cc1 -fmodules %s -emit-pch -o %t1.pch -fmodules-cache-path=%t.mcp -I %S/Inputs/redecls
+// RUN: %clang_cc1 -fmodules %s -emit-pch -o %t2.pch -include-pch %t1.pch -fmodules-cache-path=%t.mcp -I %S/Inputs/redecls
+// RUN: %clang_cc1 -fmodules %s -fsyntax-only -include-pch %t2.pch -I %S/Inputs/redecls -fmodules-cache-path=%t.mcp -verify
 
 #ifndef HEADER1
 #define HEADER1
diff --git a/clang/test/Modules/self-import-header/test.m b/clang/test/Modules/self-import-header.m
index 377c01d66eb..4acc310fdec 100644
--- a/clang/test/Modules/self-import-header/test.m
+++ b/clang/test/Modules/self-import-header.m
@@ -3,6 +3,6 @@
 // RUN: rm -rf %t
 // RUN: %clang -fsyntax-only -isysroot %S/../Inputs/System/usr/include -fmodules -fmodules-cache-path=%t \
 // RUN:    -target x86_64-darwin \
-// RUN:    -F %S -I %S %s -D__need_wint_t -Werror=implicit-function-declaration
+// RUN:    -F %S -I %S/Inputs/self-import-header %s -D__need_wint_t -Werror=implicit-function-declaration
 
 @import af;
diff --git a/clang/test/lit.cfg b/clang/test/lit.cfg
index b7e64b6a284..0d6fb91b3b0 100644
--- a/clang/test/lit.cfg
+++ b/clang/test/lit.cfg
@@ -44,7 +44,7 @@ else:
 config.test_format = lit.formats.ShTest(execute_external)
 
 # suffixes: A list of file extensions to treat as test files.
-config.suffixes = ['.c', '.cpp', '.m', '.mm', '.cu', '.ll', '.cl', '.s', '.S']
+config.suffixes = ['.c', '.cpp', '.m', '.mm', '.cu', '.ll', '.cl', '.s', '.S', '.modulemap']
 
 # excludes: A list of directories to exclude from the testsuite. The 'Inputs'
 # subdirectories contain auxiliary inputs for various tests in their parent