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

[Manuel Klimek]

Author: klimek
Date: Fri Dec 13 04:08:24 2013
New Revision: 197222

URL: http://llvm.org/viewvc/llvm-project?rev=197222&view=rev
Log:
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.

Added:
    cfe/trunk/test/Modules/Inputs/unnecessary-module-map-parsing/
    cfe/trunk/test/Modules/Inputs/unnecessary-module-map-parsing/a1.h
      - copied, changed from r197209, cfe/trunk/test/Modules/unnecessary-module-map-parsing/a1.h
    cfe/trunk/test/Modules/Inputs/unnecessary-module-map-parsing/module.map
      - copied, changed from r197209, cfe/trunk/test/Modules/unnecessary-module-map-parsing/module.map
Removed:
    cfe/trunk/test/Modules/unnecessary-module-map-parsing/a1.h
    cfe/trunk/test/Modules/unnecessary-module-map-parsing/module.map
Modified:
    cfe/trunk/test/Modules/renamed.m
    cfe/trunk/test/Modules/unnecessary-module-map-parsing.c

Copied: cfe/trunk/test/Modules/Inputs/unnecessary-module-map-parsing/a1.h (from r197209, cfe/trunk/test/Modules/unnecessary-module-map-parsing/a1.h)
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Modules/Inputs/unnecessary-module-map-parsing/a1.h?p2=cfe/trunk/test/Modules/Inputs/unnecessary-module-map-parsing/a1.h&p1=cfe/trunk/test/Modules/unnecessary-module-map-parsing/a1.h&r1=197209&r2=197222&rev=197222&view=diff
==============================================================================
    (empty)

Copied: cfe/trunk/test/Modules/Inputs/unnecessary-module-map-parsing/module.map (from r197209, cfe/trunk/test/Modules/unnecessary-module-map-parsing/module.map)
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Modules/Inputs/unnecessary-module-map-parsing/module.map?p2=cfe/trunk/test/Modules/Inputs/unnecessary-module-map-parsing/module.map&p1=cfe/trunk/test/Modules/unnecessary-module-map-parsing/module.map&r1=197209&r2=197222&rev=197222&view=diff
==============================================================================
    (empty)

Modified: cfe/trunk/test/Modules/renamed.m
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Modules/renamed.m?rev=197222&r1=197221&r2=197222&view=diff
==============================================================================
--- cfe/trunk/test/Modules/renamed.m (original)
+++ cfe/trunk/test/Modules/renamed.m Fri Dec 13 04:08:24 2013
@@ -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

Modified: cfe/trunk/test/Modules/unnecessary-module-map-parsing.c
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Modules/unnecessary-module-map-parsing.c?rev=197222&r1=197221&r2=197222&view=diff
==============================================================================
--- cfe/trunk/test/Modules/unnecessary-module-map-parsing.c (original)
+++ cfe/trunk/test/Modules/unnecessary-module-map-parsing.c Fri Dec 13 04:08:24 2013
@@ -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
 

Removed: cfe/trunk/test/Modules/unnecessary-module-map-parsing/a1.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Modules/unnecessary-module-map-parsing/a1.h?rev=197221&view=auto
==============================================================================
--- cfe/trunk/test/Modules/unnecessary-module-map-parsing/a1.h (original)
+++ cfe/trunk/test/Modules/unnecessary-module-map-parsing/a1.h (removed)
@@ -1 +0,0 @@
-void f() {}

Removed: cfe/trunk/test/Modules/unnecessary-module-map-parsing/module.map
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Modules/unnecessary-module-map-parsing/module.map?rev=197221&view=auto
==============================================================================
--- cfe/trunk/test/Modules/unnecessary-module-map-parsing/module.map (original)
+++ cfe/trunk/test/Modules/unnecessary-module-map-parsing/module.map (removed)
@@ -1,3 +0,0 @@
-module a {
-  header "unknown.h"
-}