From ee6d3fa07eed0d3187ded0cbc63fdbbdc4a8480c Mon Sep 17 00:00:00 2001
From: Sean Callanan <scallanan@apple.com>
Date: Wed, 16 Nov 2016 18:21:00 +0000
Subject: Fixed layout of test/ASTMerge.

As outlined in a previous RFC, the test/ASTMerge/Inputs folder is getting full and the tests are starting to become interdependent. This is undesirable because

- it makes it harder to write new tests
- it makes it harder to figure out at a glance what old tests are doing, and
- it adds the risk of breaking one test while changing a different one, because of the interdependencies.

To fix this, according to the conversation in the RFC, I have changed the layout from

a.c
Inputs/a1.c
Inputs/a2.c

to

a/test.c
a/Inputs/a1.c
a/Inputs/a2.c
for all existing tests. I have also eliminated interdependencies by replicating the input files for each test that uses them.

https://reviews.llvm.org/D26571

llvm-svn: 287129
---
 clang/test/ASTMerge/Inputs/class-template2.cpp | 35 --------------------------
 1 file changed, 35 deletions(-)
 delete mode 100644 clang/test/ASTMerge/Inputs/class-template2.cpp

(limited to 'clang/test/ASTMerge/Inputs/class-template2.cpp')

diff --git a/clang/test/ASTMerge/Inputs/class-template2.cpp b/clang/test/ASTMerge/Inputs/class-template2.cpp
deleted file mode 100644
index 6300301a4ff..00000000000
--- a/clang/test/ASTMerge/Inputs/class-template2.cpp
+++ /dev/null
@@ -1,35 +0,0 @@
-template<class T>
-struct X0;
-
-template<int I>
-struct X1;
-
-template<long I>
-struct X2;
-
-template<typename>
-struct X3;
-
-template<template<int I> class>
-struct X4;
-
-template<template<int I> class>
-struct X5;
-
-template<template<int I> class>
-struct X6;
-
-typedef int Integer;
-extern X0<Integer> *x0i;
-extern X0<float> *x0f;
-extern X0<double> *x0r;
-
-template<>
-struct X0<char> {
-  int member;
-};
-
-template<>
-struct X0<wchar_t> {
-  float member;
-};
-- 
cgit v1.2.3