r220461 - Revert accidentally-committed files in r220460.

[Richard Smith]

Author: rsmith
Date: Wed Oct 22 21:02:31 2014
New Revision: 220461

URL: http://llvm.org/viewvc/llvm-project?rev=220461&view=rev
Log:
Revert accidentally-committed files in r220460.

Removed:
    cfe/trunk/test/Modules/Inputs/declare-use/m.h
    cfe/trunk/test/Modules/Inputs/declare-use/m2.h
Modified:
    cfe/trunk/test/Modules/Inputs/declare-use/module.map
    cfe/trunk/test/Modules/textual-headers.cpp

Removed: cfe/trunk/test/Modules/Inputs/declare-use/m.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Modules/Inputs/declare-use/m.h?rev=220460&view=auto
==============================================================================
--- cfe/trunk/test/Modules/Inputs/declare-use/m.h (original)
+++ cfe/trunk/test/Modules/Inputs/declare-use/m.h (removed)
@@ -1,8 +0,0 @@
-#ifdef GIMME_AN_M
-
-#ifndef M_H
-#define M_H
-const int m = 42;
-#endif
-
-#endif

Removed: cfe/trunk/test/Modules/Inputs/declare-use/m2.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Modules/Inputs/declare-use/m2.h?rev=220460&view=auto
==============================================================================
--- cfe/trunk/test/Modules/Inputs/declare-use/m2.h (original)
+++ cfe/trunk/test/Modules/Inputs/declare-use/m2.h (removed)
@@ -1 +0,0 @@
-#include "m.h"

Modified: cfe/trunk/test/Modules/Inputs/declare-use/module.map
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Modules/Inputs/declare-use/module.map?rev=220461&r1=220460&r2=220461&view=diff
==============================================================================
--- cfe/trunk/test/Modules/Inputs/declare-use/module.map (original)
+++ cfe/trunk/test/Modules/Inputs/declare-use/module.map Wed Oct 22 21:02:31 2014
@@ -61,10 +61,5 @@ module XL {
   textual header "l.h"
 }
 
-module XM {
-  private textual header "m.h"
-  textual header "m2.h"
-}
-
 module XS {
 }

Modified: cfe/trunk/test/Modules/textual-headers.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Modules/textual-headers.cpp?rev=220461&r1=220460&r2=220461&view=diff
==============================================================================
--- cfe/trunk/test/Modules/textual-headers.cpp (original)
+++ cfe/trunk/test/Modules/textual-headers.cpp Wed Oct 22 21:02:31 2014
@@ -1,6 +1,6 @@
 // RUN: rm -rf %t
 // RUN: %clang_cc1 -fmodule-maps -fmodules-cache-path=%t -fmodules-strict-decluse -fmodule-name=XG -I %S/Inputs/declare-use %s -verify
-// RUN: %clang_cc1 -fmodules -fmodules-cache-path=%t -fmodules-strict-decluse -fmodule-name=XG -I %S/Inputs/declare-use %s -verify -fmodules-no-error-recovery
+// RUN: %clang_cc1 -fmodules -fmodules-cache-path=%t -fmodules-strict-decluse -fmodule-name=XG -I %S/Inputs/declare-use %s -verify
 
 #define GIMME_A_K
 #include "k.h"
@@ -8,11 +8,4 @@
 #define GIMME_AN_L
 #include "l.h" // expected-error {{module XG does not depend on a module exporting 'l.h'}}
 
-#include "m2.h" // expected-error {{module XG does not depend on a module exporting 'm2.h'}}
-const int use_m = m;
-
-#define GIMME_AN_M
-#include "m.h"
-const int use_m_2 = m;
-
 const int g = k + l;