From 30428bc844f780f686e90ed29bb5c821146c6db6 Mon Sep 17 00:00:00 2001
From: Richard Smith <richard-llvm@metafoo.co.uk>
Date: Thu, 23 Oct 2014 02:02:31 +0000
Subject: [PATCH] Revert accidentally-committed files in r220460.

llvm-svn: 220461
---
 clang/test/Modules/Inputs/declare-use/m.h        | 8 --------
 clang/test/Modules/Inputs/declare-use/m2.h       | 1 -
 clang/test/Modules/Inputs/declare-use/module.map | 5 -----
 clang/test/Modules/textual-headers.cpp           | 9 +--------
 4 files changed, 1 insertion(+), 22 deletions(-)
 delete mode 100644 clang/test/Modules/Inputs/declare-use/m.h
 delete mode 100644 clang/test/Modules/Inputs/declare-use/m2.h

diff --git a/clang/test/Modules/Inputs/declare-use/m.h b/clang/test/Modules/Inputs/declare-use/m.h
deleted file mode 100644
index e9089ab..0000000
--- a/clang/test/Modules/Inputs/declare-use/m.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifdef GIMME_AN_M
-
-#ifndef M_H
-#define M_H
-const int m = 42;
-#endif
-
-#endif
diff --git a/clang/test/Modules/Inputs/declare-use/m2.h b/clang/test/Modules/Inputs/declare-use/m2.h
deleted file mode 100644
index 9e72835..0000000
--- a/clang/test/Modules/Inputs/declare-use/m2.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "m.h"
diff --git a/clang/test/Modules/Inputs/declare-use/module.map b/clang/test/Modules/Inputs/declare-use/module.map
index ae86152..c6c6c95 100644
--- a/clang/test/Modules/Inputs/declare-use/module.map
+++ b/clang/test/Modules/Inputs/declare-use/module.map
@@ -61,10 +61,5 @@ module XL {
   textual header "l.h"
 }
 
-module XM {
-  private textual header "m.h"
-  textual header "m2.h"
-}
-
 module XS {
 }
diff --git a/clang/test/Modules/textual-headers.cpp b/clang/test/Modules/textual-headers.cpp
index 5407899..d1be8ad 100644
--- a/clang/test/Modules/textual-headers.cpp
+++ b/clang/test/Modules/textual-headers.cpp
@@ -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;
-- 
2.7.4