diff options
| author | Manuel Klimek <klimek@google.com> | 2013-12-13 10:08:24 +0000 |
|---|---|---|
| committer | Manuel Klimek <klimek@google.com> | 2013-12-13 10:08:24 +0000 |
| commit | 6b5460c75a7ede8a9b37d8b6d5e427b84d39be15 (patch) | |
| tree | 16395d18265cde1000b8d7389fa441bd644b003f /clang/test/Modules | |
| parent | a4cc7dec707c8563d8b6211c14b5f1f7400e3881 (diff) | |
| download | bcm5719-llvm-6b5460c75a7ede8a9b37d8b6d5e427b84d39be15.tar.gz bcm5719-llvm-6b5460c75a7ede8a9b37d8b6d5e427b84d39be15.zip | |
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.
llvm-svn: 197222
Diffstat (limited to 'clang/test/Modules')
| -rw-r--r-- | clang/test/Modules/Inputs/unnecessary-module-map-parsing/a1.h (renamed from clang/test/Modules/unnecessary-module-map-parsing/a1.h) | 0 | ||||
| -rw-r--r-- | clang/test/Modules/Inputs/unnecessary-module-map-parsing/module.map (renamed from clang/test/Modules/unnecessary-module-map-parsing/module.map) | 0 | ||||
| -rw-r--r-- | clang/test/Modules/renamed.m | 2 | ||||
| -rw-r--r-- | clang/test/Modules/unnecessary-module-map-parsing.c | 4 |
4 files changed, 3 insertions, 3 deletions
diff --git a/clang/test/Modules/unnecessary-module-map-parsing/a1.h b/clang/test/Modules/Inputs/unnecessary-module-map-parsing/a1.h index 56757a701bf..56757a701bf 100644 --- a/clang/test/Modules/unnecessary-module-map-parsing/a1.h +++ b/clang/test/Modules/Inputs/unnecessary-module-map-parsing/a1.h diff --git a/clang/test/Modules/unnecessary-module-map-parsing/module.map b/clang/test/Modules/Inputs/unnecessary-module-map-parsing/module.map index 2d2104177ff..2d2104177ff 100644 --- a/clang/test/Modules/unnecessary-module-map-parsing/module.map +++ b/clang/test/Modules/Inputs/unnecessary-module-map-parsing/module.map diff --git a/clang/test/Modules/renamed.m b/clang/test/Modules/renamed.m index 4e8f5329bb0..ec2616e9a72 100644 --- a/clang/test/Modules/renamed.m +++ b/clang/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/clang/test/Modules/unnecessary-module-map-parsing.c b/clang/test/Modules/unnecessary-module-map-parsing.c index 621bb0195dd..16f7086a6d7 100644 --- a/clang/test/Modules/unnecessary-module-map-parsing.c +++ b/clang/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 |
