From 6b5460c75a7ede8a9b37d8b6d5e427b84d39be15 Mon Sep 17 00:00:00 2001 From: Manuel Klimek Date: Fri, 13 Dec 2013 10:08:24 +0000 Subject: [PATCH] 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 --- .../Modules/{ => Inputs}/unnecessary-module-map-parsing/a1.h | 0 .../{ => Inputs}/unnecessary-module-map-parsing/module.map | 0 clang/test/Modules/renamed.m | 2 +- clang/test/Modules/unnecessary-module-map-parsing.c | 4 ++-- 4 files changed, 3 insertions(+), 3 deletions(-) rename clang/test/Modules/{ => Inputs}/unnecessary-module-map-parsing/a1.h (100%) rename clang/test/Modules/{ => Inputs}/unnecessary-module-map-parsing/module.map (100%) diff --git a/clang/test/Modules/unnecessary-module-map-parsing/a1.h b/clang/test/Modules/Inputs/unnecessary-module-map-parsing/a1.h similarity index 100% rename from clang/test/Modules/unnecessary-module-map-parsing/a1.h rename to 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 similarity index 100% rename from clang/test/Modules/unnecessary-module-map-parsing/module.map rename to 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 4e8f5329bb0f..ec2616e9a724 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 621bb0195dd8..16f7086a6d7a 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