Move the input files for the unnecessary-module-map-parsing test to Inputs.

Needed to change rename.m to set the right include path so we don't
import a broken module due to recursive module checking.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@197222 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/test/Modules/unnecessary-module-map-parsing/a1.h b/test/Modules/Inputs/unnecessary-module-map-parsing/a1.h
similarity index 100%
rename from test/Modules/unnecessary-module-map-parsing/a1.h
rename to test/Modules/Inputs/unnecessary-module-map-parsing/a1.h

diff --git a/test/Modules/unnecessary-module-map-parsing/module.map b/test/Modules/Inputs/unnecessary-module-map-parsing/module.map
similarity index 100%
rename from test/Modules/unnecessary-module-map-parsing/module.map
rename to test/Modules/Inputs/unnecessary-module-map-parsing/module.map

diff --git a/test/Modules/renamed.m b/test/Modules/renamed.m
index 4e8f5329bb0f6ada755377916a73f1505bbb2d2d..ec2616e9a72436c0f6f307289714c9405e980e1f 100644 (file)
--- a/test/Modules/renamed.m
+++ b/test/Modules/renamed.m
@@ -3,6 +3,6 @@
 int f() { return same_api; }
 
 // RUN: rm -rf %t
-// RUN: %clang_cc1 -fmodules -I %S/Inputs -fmodules-cache-path=%t %s -verify
+// RUN: %clang_cc1 -fmodules -I %S/Inputs/oldname -fmodules-cache-path=%t %s -verify
 
 // expected-no-diagnostics

diff --git a/test/Modules/unnecessary-module-map-parsing.c b/test/Modules/unnecessary-module-map-parsing.c
index 621bb0195dd8b5355a346f814975efb889f07f83..16f7086a6d7a5147386fcdc1494ffe2ade0c3394 100644 (file)
--- a/test/Modules/unnecessary-module-map-parsing.c
+++ b/test/Modules/unnecessary-module-map-parsing.c
@@ -1,7 +1,7 @@
 // This checks that we are not parsing module maps if modules are not enabled.
 
-// RUN: not %clang_cc1 -fmodules -I %S/unnecessary-module-map-parsing -fsyntax-only %s 2>&1 | FileCheck %s
-// RUN: %clang_cc1 -I %S/unnecessary-module-map-parsing -fsyntax-only %s
+// RUN: not %clang_cc1 -fmodules -I %S/Inputs/unnecessary-module-map-parsing -fsyntax-only %s 2>&1 | FileCheck %s
+// RUN: %clang_cc1 -I %S/Inputs/unnecessary-module-map-parsing -fsyntax-only %s
 
 // CHECK: error: header 'unknown.h' not found