r239452 - Revert accidentally-committed test change from r239447.

[Richard Smith]

Author: rsmith
Date: Tue Jun  9 20:36:14 2015
New Revision: 239452

URL: http://llvm.org/viewvc/llvm-project?rev=239452&view=rev
Log:
Revert accidentally-committed test change from r239447.

Modified:
    cfe/trunk/test/Modules/Inputs/template-default-args/a.h
    cfe/trunk/test/Modules/Inputs/template-default-args/module.modulemap
    cfe/trunk/test/Modules/template-default-args.cpp

Modified: cfe/trunk/test/Modules/Inputs/template-default-args/a.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Modules/Inputs/template-default-args/a.h?rev=239452&r1=239451&r2=239452&view=diff
==============================================================================
--- cfe/trunk/test/Modules/Inputs/template-default-args/a.h (original)
+++ cfe/trunk/test/Modules/Inputs/template-default-args/a.h Tue Jun  9 20:36:14 2015
@@ -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;

Modified: cfe/trunk/test/Modules/Inputs/template-default-args/module.modulemap
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Modules/Inputs/template-default-args/module.modulemap?rev=239452&r1=239451&r2=239452&view=diff
==============================================================================
--- cfe/trunk/test/Modules/Inputs/template-default-args/module.modulemap (original)
+++ cfe/trunk/test/Modules/Inputs/template-default-args/module.modulemap Tue Jun  9 20:36:14 2015
@@ -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" } }

Modified: cfe/trunk/test/Modules/template-default-args.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Modules/template-default-args.cpp?rev=239452&r1=239451&r2=239452&view=diff
==============================================================================
--- cfe/trunk/test/Modules/template-default-args.cpp (original)
+++ cfe/trunk/test/Modules/template-default-args.cpp Tue Jun  9 20:36:14 2015
@@ -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;