From: Richard Smith <richard-llvm@metafoo.co.uk>
Date: Wed, 10 Jun 2015 01:36:14 +0000 (+0000)
Subject: Revert accidentally-committed test change from r239447.
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=56d2f811d31a5e8ac2769698afeb95b71967c980;p=clang

Revert accidentally-committed test change from r239447.


git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@239452 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/test/Modules/Inputs/template-default-args/a.h b/test/Modules/Inputs/template-default-args/a.h
index 3e41535824..1ef1ea5907 100644
--- a/test/Modules/Inputs/template-default-args/a.h
+++ b/test/Modules/Inputs/template-default-args/a.h
@@ -2,4 +2,3 @@ template<typename T = int> struct A {};
 template<typename T> struct B {};
 template<typename T> struct C;
 template<typename T> struct D;
-template<typename T> struct E;
diff --git a/test/Modules/Inputs/template-default-args/module.modulemap b/test/Modules/Inputs/template-default-args/module.modulemap
index d54dfc345a..6182e6b3ee 100644
--- a/test/Modules/Inputs/template-default-args/module.modulemap
+++ b/test/Modules/Inputs/template-default-args/module.modulemap
@@ -1,5 +1 @@
-module X {
-  module A { header "a.h" }
-  module B { header "b.h" }
-  module C { header "c.h" }
-}
+module X { module A { header "a.h" } module B { header "b.h" } }
diff --git a/test/Modules/template-default-args.cpp b/test/Modules/template-default-args.cpp
index 97569f0aa3..63187b8dc1 100644
--- a/test/Modules/template-default-args.cpp
+++ b/test/Modules/template-default-args.cpp
@@ -7,7 +7,6 @@ template<typename T> struct A;
 template<typename T> struct B;
 template<typename T> struct C;
 template<typename T = int> struct D;
-template<typename T = int> struct E {};
 
 #include "b.h"
 
@@ -16,13 +15,8 @@ template<typename T> struct B {};
 template<typename T = int> struct B;
 template<typename T = int> struct C;
 template<typename T> struct D {};
-template<typename T> struct F {};
-
-#include "c.h"
 
 A<> a;
 B<> b;
 extern C<> c;
 D<> d;
-E<> e;
-F<> f;