10 files changed, 17 insertions, 19 deletions
diff --git a/clang-tools-extra/test/clang-rename/ClassFindByName.cpp b/clang-tools-extra/test/clang-rename/ClassFindByName.cpp
index 42b42993026..4430891ec4b 100644
--- a/clang-tools-extra/test/clang-rename/ClassFindByName.cpp
+++ b/clang-tools-extra/test/clang-rename/ClassFindByName.cpp
@@ -7,4 +7,4 @@ int main() {
 }
 
 // Test 1.
-// RUN: clang-rename rename-all -old-name=Foo -new-name=Bar %s -- | sed 's,//.*,,' | FileCheck %s
+// RUN: clang-rename -qualified-name=Foo -new-name=Bar %s -- | sed 's,//.*,,' | FileCheck %s
diff --git a/clang-tools-extra/test/clang-rename/ClassTestMulti.cpp b/clang-tools-extra/test/clang-rename/ClassTestMulti.cpp
index 22911dfa58b..81e65c76065 100644
--- a/clang-tools-extra/test/clang-rename/ClassTestMulti.cpp
+++ b/clang-tools-extra/test/clang-rename/ClassTestMulti.cpp
@@ -5,7 +5,7 @@ class Foo2 /* Offset 2 */ { // CHECK: class Bar2 /* Offset 2 */ {
 };
 
 // Test 1.
-// RUN: clang-rename rename-all -offset=6 -new-name=Bar1 -offset=76 -new-name=Bar2 %s -- | sed 's,//.*,,' | FileCheck %s
+// RUN: clang-rename -offset=6 -new-name=Bar1 -offset=76 -new-name=Bar2 %s -- | sed 's,//.*,,' | FileCheck %s
 
 // To find offsets after modifying the file, use:
 //   grep -Ubo 'Foo.*' <file>
diff --git a/clang-tools-extra/test/clang-rename/ClassTestMultiByName.cpp b/clang-tools-extra/test/clang-rename/ClassTestMultiByName.cpp
index 90527508db0..61b69a1bdf4 100644
--- a/clang-tools-extra/test/clang-rename/ClassTestMultiByName.cpp
+++ b/clang-tools-extra/test/clang-rename/ClassTestMultiByName.cpp
@@ -5,4 +5,4 @@ class Foo2 { // CHECK: class Bar2
 };
 
 // Test 1.
-// RUN: clang-rename rename-all -old-name=Foo1 -new-name=Bar1 -old-name=Foo2 -new-name=Bar2 %s -- | sed 's,//.*,,' | FileCheck %s
+// RUN: clang-rename -qualified-name=Foo1 -new-name=Bar1 -qualified-name=Foo2 -new-name=Bar2 %s -- | sed 's,//.*,,' | FileCheck %s
diff --git a/clang-tools-extra/test/clang-rename/ClassTestMultiByNameYAML.cpp b/clang-tools-extra/test/clang-rename/ClassTestMultiByNameYAML.cpp
deleted file mode 100644
index ecf506f442d..00000000000
--- a/clang-tools-extra/test/clang-rename/ClassTestMultiByNameYAML.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
-class Foo1 { // CHECK: class Bar1
-};
-
-class Foo2 { // CHECK: class Bar2
-};
-
-// Test 1.
-// RUN: clang-rename rename-all -input %S/Inputs/ClassTestMultiByNameYAMLRenameAll.yaml %s -- | sed 's,//.*,,' | FileCheck %s
-// Test 2.
-// RUN: clang-rename rename-all -input %S/Inputs/ClassTestMultiByNameYAMLRenameAt.yaml %s -- | sed 's,//.*,,' | FileCheck %s
diff --git a/clang-tools-extra/test/clang-rename/FunctionWithClassFindByName.cpp b/clang-tools-extra/test/clang-rename/FunctionWithClassFindByName.cpp
index d197ca14b3a..2cae09a1c24 100644
--- a/clang-tools-extra/test/clang-rename/FunctionWithClassFindByName.cpp
+++ b/clang-tools-extra/test/clang-rename/FunctionWithClassFindByName.cpp
@@ -9,4 +9,4 @@ int main() {
   return 0;
 }
 
-// RUN: clang-rename rename-all -old-name=Foo -new-name=Bar %s -- | sed 's,//.*,,' | FileCheck %s
+// RUN: clang-rename -qualified-name=Foo -new-name=Bar %s -- | sed 's,//.*,,' | FileCheck %s
diff --git a/clang-tools-extra/test/clang-rename/Inputs/ClassTestMultiByNameYAMLRenameAt.yaml b/clang-tools-extra/test/clang-rename/Inputs/OffsetToNewName.yaml
index d8e972880f3..d8e972880f3 100644
--- a/clang-tools-extra/test/clang-rename/Inputs/ClassTestMultiByNameYAMLRenameAt.yaml
+++ b/clang-tools-extra/test/clang-rename/Inputs/OffsetToNewName.yaml
diff --git a/clang-tools-extra/test/clang-rename/Inputs/ClassTestMultiByNameYAMLRenameAll.yaml b/clang-tools-extra/test/clang-rename/Inputs/QualifiedNameToNewName.yaml
index cb381b30e50..6e3783671df 100644
--- a/clang-tools-extra/test/clang-rename/Inputs/ClassTestMultiByNameYAMLRenameAll.yaml
+++ b/clang-tools-extra/test/clang-rename/Inputs/QualifiedNameToNewName.yaml
@@ -1,6 +1,6 @@
 ---
-- OldName:        Foo1
+- QualifiedName:  Foo1
   NewName:        Bar1
-- OldName:        Foo2
+- QualifiedName:  Foo2
   NewName:        Bar2
 ...
diff --git a/clang-tools-extra/test/clang-rename/InvalidOldName.cpp b/clang-tools-extra/test/clang-rename/InvalidOldName.cpp
deleted file mode 100644
index 11f2763e408..00000000000
--- a/clang-tools-extra/test/clang-rename/InvalidOldName.cpp
+++ /dev/null
@@ -1,2 +0,0 @@
-// RUN: not clang-rename rename-all -new-name=Foo -old-name=Bar %s -- 2>&1 | FileCheck %s
-// CHECK: clang-rename: could not find symbol Bar.
diff --git a/clang-tools-extra/test/clang-rename/NoNewName.cpp b/clang-tools-extra/test/clang-rename/NoNewName.cpp
index 11a637b88ae..4f882d83b0c 100644
--- a/clang-tools-extra/test/clang-rename/NoNewName.cpp
+++ b/clang-tools-extra/test/clang-rename/NoNewName.cpp
@@ -1,4 +1,4 @@
 // Check for an error while -new-name argument has not been passed to
 // clang-rename.
 // RUN: not clang-rename -offset=133 %s 2>&1 | FileCheck %s
-// CHECK: clang-rename: for the -new-name option: must be specified
+// CHECK: clang-rename: -new-name must be specified.
diff --git a/clang-tools-extra/test/clang-rename/YAMLInput.cpp b/clang-tools-extra/test/clang-rename/YAMLInput.cpp
new file mode 100644
index 00000000000..55dbc6d66a5
--- /dev/null
+++ b/clang-tools-extra/test/clang-rename/YAMLInput.cpp
@@ -0,0 +1,10 @@
+class Foo1 { // CHECK: class Bar1
+};
+
+class Foo2 { // CHECK: class Bar2
+};
+
+// Test 1.
+// RUN: clang-rename -input %S/Inputs/OffsetToNewName.yaml %s -- | sed 's,//.*,,' | FileCheck %s
+// Test 2.
+// RUN: clang-rename -input %S/Inputs/QualifiedNameToNewName.yaml %s -- | sed 's,//.*,,' | FileCheck %s