[clang-rename] merge tests when possible

The only difference between some tests is -offset passed to clang-rename. It
makes sense to merge them into a single file and add multiple tool invocations.

Reviewers: alexfh

Differential Revision: https://reviews.llvm.org/D23158

llvm-svn: 278221

1 files changed, 9 insertions, 8 deletions

diff --git a/clang-tools-extra/test/clang-rename/CtorInitializer.cpp b/clang-tools-extra/test/clang-rename/CtorInitializer.cpp
index 1fa16657950..fed4f5b06c2 100644
--- a/clang-tools-extra/test/clang-rename/CtorInitializer.cpp
+++ b/clang-tools-extra/test/clang-rename/CtorInitializer.cpp
@@ -1,16 +1,17 @@
-// RUN: cat %s > %t.cpp
-// RUN: clang-rename -offset=163 -new-name=Bar %t.cpp -i --
-// RUN: sed 's,//.*,,' %t.cpp | FileCheck %s
-
 class Baz {};
 
 class Qux {
-  Baz Foo;            // CHECK: Baz Bar;
+  Baz Foo;         /* Test 1 */       // CHECK: Baz Bar;
 public:
   Qux();
 };
 
-Qux::Qux() : Foo() {} // CHECK: Qux::Qux() : Bar() {}
+Qux::Qux() : Foo() /* Test 2 */ {}    // CHECK: Qux::Qux() : Bar() /* Test 2 */ {}
+
+// Test 1.
+// RUN: clang-rename -offset=33 -new-name=Bar %s -- | sed 's,//.*,,' | FileCheck %s
+// Test 2.
+// RUN: clang-rename -offset=118 -new-name=Bar %s -- | sed 's,//.*,,' | FileCheck %s
 
-// Use grep -FUbo 'Foo' <file> to get the correct offset of foo when changing
-// this file.
+// To find offsets after modifying the file, use:
+//   grep -Ubo 'Foo.*' <file>