summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--clang-tools-extra/test/clang-rename/ClassAsTemplateArgumentFindByClass.cpp4
-rw-r--r--clang-tools-extra/test/clang-rename/ClassAsTemplateArgumentFindByTemplateArgument.cpp4
-rw-r--r--clang-tools-extra/test/clang-rename/ClassFindByName.cpp4
-rw-r--r--clang-tools-extra/test/clang-rename/ClassNameInFunctionDefenition.cpp4
-rw-r--r--clang-tools-extra/test/clang-rename/ClassSimpleRenaming.cpp6
-rw-r--r--clang-tools-extra/test/clang-rename/ComplicatedClassType.cpp4
-rw-r--r--clang-tools-extra/test/clang-rename/ConstCastExpr.cpp6
-rw-r--r--clang-tools-extra/test/clang-rename/ConstructExpr.cpp6
-rw-r--r--clang-tools-extra/test/clang-rename/CtorFindByDeclaration.cpp6
-rw-r--r--clang-tools-extra/test/clang-rename/CtorFindByDefinition.cpp6
-rw-r--r--clang-tools-extra/test/clang-rename/CtorInitializer.cpp4
-rw-r--r--clang-tools-extra/test/clang-rename/DeclRefExpr.cpp6
-rw-r--r--clang-tools-extra/test/clang-rename/DtorDeclaration.cpp6
-rw-r--r--clang-tools-extra/test/clang-rename/DtorDefinition.cpp6
-rw-r--r--clang-tools-extra/test/clang-rename/DynamicCastExpr.cpp6
-rw-r--r--clang-tools-extra/test/clang-rename/Field.cpp4
-rw-r--r--clang-tools-extra/test/clang-rename/FunctionMacro.cpp6
-rw-r--r--clang-tools-extra/test/clang-rename/MemberExprMacro.cpp4
-rw-r--r--clang-tools-extra/test/clang-rename/Namespace.cpp6
-rw-r--r--clang-tools-extra/test/clang-rename/ReinterpretCastExpr.cpp7
-rw-r--r--clang-tools-extra/test/clang-rename/StaticCastExpr.cpp4
-rw-r--r--clang-tools-extra/test/clang-rename/TemplateFunctionFindByDeclaration.cpp4
-rw-r--r--clang-tools-extra/test/clang-rename/TemplateFunctionFindByUse.cpp4
-rw-r--r--clang-tools-extra/test/clang-rename/TemplateTypenameFindByTypeInside.cpp4
-rw-r--r--clang-tools-extra/test/clang-rename/UserDefinedConversionFindByTypeDeclaration.cpp6
-rw-r--r--clang-tools-extra/test/clang-rename/Variable.cpp6
-rw-r--r--clang-tools-extra/test/clang-rename/VariableMacro.cpp6
27 files changed, 43 insertions, 96 deletions
diff --git a/clang-tools-extra/test/clang-rename/ClassAsTemplateArgumentFindByClass.cpp b/clang-tools-extra/test/clang-rename/ClassAsTemplateArgumentFindByClass.cpp
index 19015a28013..a75d13c0a24 100644
--- a/clang-tools-extra/test/clang-rename/ClassAsTemplateArgumentFindByClass.cpp
+++ b/clang-tools-extra/test/clang-rename/ClassAsTemplateArgumentFindByClass.cpp
@@ -1,6 +1,4 @@
-// RUN: cat %s > %t.cpp
-// RUN: clang-rename -offset=136 -new-name=Bar %t.cpp -i --
-// RUN: sed 's,//.*,,' %t.cpp | FileCheck %s
+// RUN: clang-rename -offset=74 -new-name=Bar %s -- | FileCheck %s
class Foo {}; // CHECK: class Bar {};
diff --git a/clang-tools-extra/test/clang-rename/ClassAsTemplateArgumentFindByTemplateArgument.cpp b/clang-tools-extra/test/clang-rename/ClassAsTemplateArgumentFindByTemplateArgument.cpp
index 7fdf911fa41..b95f6fc6d5f 100644
--- a/clang-tools-extra/test/clang-rename/ClassAsTemplateArgumentFindByTemplateArgument.cpp
+++ b/clang-tools-extra/test/clang-rename/ClassAsTemplateArgumentFindByTemplateArgument.cpp
@@ -1,6 +1,4 @@
-// RUN: cat %s > %t.cpp
-// RUN: clang-rename -offset=304 -new-name=Bar %t.cpp -i --
-// RUN: sed 's,//.*,,' %t.cpp | FileCheck %s
+// RUN: clang-rename -offset=243 -new-name=Bar %s -- | FileCheck %s
class Foo {}; // CHECK: class Bar {};
diff --git a/clang-tools-extra/test/clang-rename/ClassFindByName.cpp b/clang-tools-extra/test/clang-rename/ClassFindByName.cpp
index 4cd090c1f2f..5ec4deab574 100644
--- a/clang-tools-extra/test/clang-rename/ClassFindByName.cpp
+++ b/clang-tools-extra/test/clang-rename/ClassFindByName.cpp
@@ -1,6 +1,4 @@
-// RUN: cat %s > %t.cpp
-// RUN: clang-rename -old-name=Foo -new-name=Bar %t.cpp -i --
-// RUN: sed 's,//.*,,' %t.cpp | FileCheck %s
+// RUN: clang-rename -old-name=Foo -new-name=Bar %s -- | FileCheck %s
class Foo { // CHECK: class Bar
};
diff --git a/clang-tools-extra/test/clang-rename/ClassNameInFunctionDefenition.cpp b/clang-tools-extra/test/clang-rename/ClassNameInFunctionDefenition.cpp
index 1b2d59e1862..91636faa719 100644
--- a/clang-tools-extra/test/clang-rename/ClassNameInFunctionDefenition.cpp
+++ b/clang-tools-extra/test/clang-rename/ClassNameInFunctionDefenition.cpp
@@ -1,6 +1,4 @@
-// RUN: cat %s > %t.cpp
-// RUN: clang-rename -offset=136 -new-name=Bar %t.cpp -i --
-// RUN: sed 's,//.*,,' %t.cpp | FileCheck %s
+// RUN: clang-rename -offset=74 -new-name=Bar %s -- | FileCheck %s
class Foo { // CHECK: class Bar {
public:
diff --git a/clang-tools-extra/test/clang-rename/ClassSimpleRenaming.cpp b/clang-tools-extra/test/clang-rename/ClassSimpleRenaming.cpp
index 72710d05de4..94c5243f0aa 100644
--- a/clang-tools-extra/test/clang-rename/ClassSimpleRenaming.cpp
+++ b/clang-tools-extra/test/clang-rename/ClassSimpleRenaming.cpp
@@ -1,6 +1,4 @@
-// RUN: cat %s > %t.cpp
-// RUN: clang-rename -offset=136 -new-name=Bar %t.cpp -i --
-// RUN: sed 's,//.*,,' %t.cpp | FileCheck %s
+// RUN: clang-rename -offset=74 -new-name=Bar %s -- | FileCheck %s
class Foo {}; // CHECK: class Bar
@@ -9,5 +7,5 @@ int main() {
return 0;
}
-// Use grep -FUbo 'Foo' <file> to get the correct offset of Cla when changing
+// Use grep -FUbo 'Foo' <file> to get the correct offset of Foo when changing
// this file.
diff --git a/clang-tools-extra/test/clang-rename/ComplicatedClassType.cpp b/clang-tools-extra/test/clang-rename/ComplicatedClassType.cpp
index 6e888bdb059..429c60a3257 100644
--- a/clang-tools-extra/test/clang-rename/ComplicatedClassType.cpp
+++ b/clang-tools-extra/test/clang-rename/ComplicatedClassType.cpp
@@ -1,6 +1,4 @@
-// RUN: cat %s > %t.cpp
-// RUN: clang-rename -offset=220 -new-name=Bar %t.cpp -i --
-// RUN: sed 's,//.*,,' %t.cpp | FileCheck %s
+// RUN: clang-rename -offset=159 -new-name=Bar %s -- | FileCheck %s
// Forward declaration.
class Foo; // CHECK: class Bar;
diff --git a/clang-tools-extra/test/clang-rename/ConstCastExpr.cpp b/clang-tools-extra/test/clang-rename/ConstCastExpr.cpp
index 6d6914fad1d..7336a1621d9 100644
--- a/clang-tools-extra/test/clang-rename/ConstCastExpr.cpp
+++ b/clang-tools-extra/test/clang-rename/ConstCastExpr.cpp
@@ -1,6 +1,4 @@
-// RUN: cat %s > %t.cpp
-// RUN: clang-rename -offset=136 -new-name=Bar %t.cpp -i --
-// RUN: sed 's,//.*,,' %t.cpp | FileCheck %s
+// RUN: clang-rename -offset=74 -new-name=Bar %s -- | FileCheck %s
class Foo { // CHECK: class Bar {
public:
@@ -14,5 +12,5 @@ int main() {
const_cast<Foo *>(C)->getValue(); // CHECK: const_cast<Bar *>(C)->getValue();
}
-// Use grep -FUbo 'Cla' <file> to get the correct offset of foo when changing
+// Use grep -FUbo 'Foo' <file> to get the correct offset of Foo when changing
// this file.
diff --git a/clang-tools-extra/test/clang-rename/ConstructExpr.cpp b/clang-tools-extra/test/clang-rename/ConstructExpr.cpp
index d7f104c03d8..4c795e2f61d 100644
--- a/clang-tools-extra/test/clang-rename/ConstructExpr.cpp
+++ b/clang-tools-extra/test/clang-rename/ConstructExpr.cpp
@@ -1,6 +1,4 @@
-// RUN: cat %s > %t.cpp
-// RUN: clang-rename -offset=136 -new-name=Boo %t.cpp -i --
-// RUN: sed 's,//.*,,' %t.cpp | FileCheck %s
+// RUN: clang-rename -offset=74 -new-name=Boo %s -- | FileCheck %s
class Foo {}; // CHECK: class Boo {};
@@ -8,5 +6,5 @@ int main() {
Foo *C = new Foo(); // CHECK: Boo *C = new Boo();
}
-// Use grep -FUbo 'Boo' <file> to get the correct offset of foo when changing
+// Use grep -FUbo 'Foo' <file> to get the correct offset of Foo when changing
// this file.
diff --git a/clang-tools-extra/test/clang-rename/CtorFindByDeclaration.cpp b/clang-tools-extra/test/clang-rename/CtorFindByDeclaration.cpp
index 3fb25aedbda..d615ba5cc60 100644
--- a/clang-tools-extra/test/clang-rename/CtorFindByDeclaration.cpp
+++ b/clang-tools-extra/test/clang-rename/CtorFindByDeclaration.cpp
@@ -1,6 +1,4 @@
-// RUN: cat %s > %t.cpp
-// RUN: clang-rename -offset=174 -new-name=Bar %t.cpp -i --
-// RUN: sed 's,//.*,,' %t.cpp | FileCheck %s
+// RUN: clang-rename -offset=113 -new-name=Bar %s -- | FileCheck %s
class Foo { // CHECK: class Bar
public:
@@ -9,5 +7,5 @@ public:
Foo::Foo() {} // CHECK: Bar::Bar()
-// Use grep -FUbo 'C' <file> to get the correct offset of foo when changing
+// Use grep -FUbo 'Foo' <file> to get the correct offset of Foo when changing
// this file.
diff --git a/clang-tools-extra/test/clang-rename/CtorFindByDefinition.cpp b/clang-tools-extra/test/clang-rename/CtorFindByDefinition.cpp
index 2f7e65c190d..646d69894bb 100644
--- a/clang-tools-extra/test/clang-rename/CtorFindByDefinition.cpp
+++ b/clang-tools-extra/test/clang-rename/CtorFindByDefinition.cpp
@@ -1,6 +1,4 @@
-// RUN: cat %s > %t.cpp
-// RUN: clang-rename -offset=212 -new-name=Bar %t.cpp -i --
-// RUN: sed 's,//.*,,' %t.cpp | FileCheck %s
+// RUN: clang-rename -offset=151 -new-name=Bar %s -- | FileCheck %s
class Foo { // CHECK: class Bar
public:
@@ -9,5 +7,5 @@ public:
Foo::Foo() {} // CHECK: Bar::Bar()
-// Use grep -FUbo 'C' <file> to get the correct offset of foo when changing
+// Use grep -FUbo 'Foo' <file> to get the correct offset of Foo when changing
// this file.
diff --git a/clang-tools-extra/test/clang-rename/CtorInitializer.cpp b/clang-tools-extra/test/clang-rename/CtorInitializer.cpp
index 1fa16657950..087cb81cff5 100644
--- a/clang-tools-extra/test/clang-rename/CtorInitializer.cpp
+++ b/clang-tools-extra/test/clang-rename/CtorInitializer.cpp
@@ -1,6 +1,4 @@
-// RUN: cat %s > %t.cpp
-// RUN: clang-rename -offset=163 -new-name=Bar %t.cpp -i --
-// RUN: sed 's,//.*,,' %t.cpp | FileCheck %s
+// RUN: clang-rename -offset=102 -new-name=Bar %s -- | FileCheck %s
class Baz {};
diff --git a/clang-tools-extra/test/clang-rename/DeclRefExpr.cpp b/clang-tools-extra/test/clang-rename/DeclRefExpr.cpp
index 2059ff0b398..0706e07a5e1 100644
--- a/clang-tools-extra/test/clang-rename/DeclRefExpr.cpp
+++ b/clang-tools-extra/test/clang-rename/DeclRefExpr.cpp
@@ -1,6 +1,4 @@
-// RUN: cat %s > %t.cpp
-// RUN: clang-rename -offset=161 -new-name=Bar %t.cpp -i --
-// RUN: sed 's,//.*,,' %t.cpp | FileCheck %s
+// RUN: clang-rename -offset=100 -new-name=Bar %s -- | FileCheck %s
class C {
public:
@@ -16,5 +14,5 @@ int main() {
int y = C::Foo; // CHECK: C::Bar
}
-// Use grep -FUbo 'X' <file> to get the correct offset of foo when changing
+// Use grep -FUbo 'Foo' <file> to get the correct offset of Foo when changing
// this file.
diff --git a/clang-tools-extra/test/clang-rename/DtorDeclaration.cpp b/clang-tools-extra/test/clang-rename/DtorDeclaration.cpp
index 239ae57c61e..3a10db0d2ee 100644
--- a/clang-tools-extra/test/clang-rename/DtorDeclaration.cpp
+++ b/clang-tools-extra/test/clang-rename/DtorDeclaration.cpp
@@ -1,6 +1,4 @@
-// RUN: cat %s > %t.cpp
-// RUN: clang-rename -offset=175 -new-name=Bar %t.cpp -i --
-// RUN: sed 's,//.*,,' %t.cpp | FileCheck %s
+// RUN: clang-rename -offset=114 -new-name=Bar %s -- | FileCheck %s
class Foo { // CHECK: class Bar {
public:
@@ -10,5 +8,5 @@ public:
Foo::~Foo() { // CHECK: Bar::~Bar()
}
-// Use grep -FUbo 'Bar' <file> to get the correct offset of foo when changing
+// Use grep -FUbo 'Foo' <file> to get the correct offset of Foo when changing
// this file.
diff --git a/clang-tools-extra/test/clang-rename/DtorDefinition.cpp b/clang-tools-extra/test/clang-rename/DtorDefinition.cpp
index d81739755a0..d3b94023bea 100644
--- a/clang-tools-extra/test/clang-rename/DtorDefinition.cpp
+++ b/clang-tools-extra/test/clang-rename/DtorDefinition.cpp
@@ -1,6 +1,4 @@
-// RUN: cat %s > %t.cpp
-// RUN: clang-rename -offset=219 -new-name=Bar %t.cpp -i --
-// RUN: sed 's,//.*,,' %t.cpp | FileCheck %s
+// RUN: clang-rename -offset=158 -new-name=Bar %s -- | FileCheck %s
class Foo { // CHECK: class Bar {
public:
@@ -10,5 +8,5 @@ public:
Foo::~Foo() {} // CHECK: Bar::~Bar()
-// Use grep -FUbo 'Foo' <file> to get the correct offset of foo when changing
+// Use grep -FUbo 'Foo' <file> to get the correct offset of Foo when changing
// this file.
diff --git a/clang-tools-extra/test/clang-rename/DynamicCastExpr.cpp b/clang-tools-extra/test/clang-rename/DynamicCastExpr.cpp
index b940dd7dcc0..cd3600d464b 100644
--- a/clang-tools-extra/test/clang-rename/DynamicCastExpr.cpp
+++ b/clang-tools-extra/test/clang-rename/DynamicCastExpr.cpp
@@ -1,6 +1,4 @@
-// RUN: cat %s > %t.cpp
-// RUN: clang-rename -offset=195 -new-name=Bar %t.cpp -i -- -frtti
-// RUN: sed 's,//.*,,' %t.cpp | FileCheck %s
+// RUN: clang-rename -offset=134 -new-name=Bar %s -- -frtti | FileCheck %s
class Baz {
virtual int getValue() const = 0;
@@ -22,5 +20,5 @@ int main() {
dynamic_cast<const Foo *>(Pointer)->getValue(); // CHECK: dynamic_cast<const Bar *>(Pointer)->getValue();
}
-// Use grep -FUbo 'Foo' <file> to get the correct offset of foo when changing
+// Use grep -FUbo 'Foo' <file> to get the correct offset of Foo when changing
// this file.
diff --git a/clang-tools-extra/test/clang-rename/Field.cpp b/clang-tools-extra/test/clang-rename/Field.cpp
index 217955852b2..d7c7e7b9363 100644
--- a/clang-tools-extra/test/clang-rename/Field.cpp
+++ b/clang-tools-extra/test/clang-rename/Field.cpp
@@ -1,6 +1,4 @@
-// RUN: cat %s > %t.cpp
-// RUN: clang-rename -offset=148 -new-name=Bar %t.cpp -i --
-// RUN: sed 's,//.*,,' %t.cpp | FileCheck %s
+// RUN: clang-rename -offset=87 -new-name=Bar %s -- | FileCheck %s
class Baz {
int Foo; // CHECK: Bar;
diff --git a/clang-tools-extra/test/clang-rename/FunctionMacro.cpp b/clang-tools-extra/test/clang-rename/FunctionMacro.cpp
index 1cdac27ab3b..78b93e5ea3b 100644
--- a/clang-tools-extra/test/clang-rename/FunctionMacro.cpp
+++ b/clang-tools-extra/test/clang-rename/FunctionMacro.cpp
@@ -1,6 +1,4 @@
-// RUN: cat %s > %t.cpp
-// RUN: clang-rename -offset=199 -new-name=macro_function %t.cpp -i --
-// RUN: sed 's,//.*,,' %t.cpp | FileCheck %s
+// RUN: clang-rename -offset=138 -new-name=macro_function %s -- | FileCheck %s
#define moo foo // CHECK: #define moo macro_function
@@ -17,5 +15,5 @@ void qoo() {
boo(moo());
}
-// Use grep -FUbo 'foo;' <file> to get the correct offset of foo when changing
+// Use grep -FUbo 'foo' <file> to get the correct offset of foo when changing
// this file.
diff --git a/clang-tools-extra/test/clang-rename/MemberExprMacro.cpp b/clang-tools-extra/test/clang-rename/MemberExprMacro.cpp
index 24ba05ff83d..96900d55a2c 100644
--- a/clang-tools-extra/test/clang-rename/MemberExprMacro.cpp
+++ b/clang-tools-extra/test/clang-rename/MemberExprMacro.cpp
@@ -1,6 +1,4 @@
-// RUN: cat %s > %t.cpp
-// RUN: clang-rename -offset=156 -new-name=Bar %t.cpp -i --
-// RUN: sed 's,//.*,,' %t.cpp | FileCheck %s
+// RUN: clang-rename -offset=95 -new-name=Bar %s -- | FileCheck %s
class Baz {
public:
diff --git a/clang-tools-extra/test/clang-rename/Namespace.cpp b/clang-tools-extra/test/clang-rename/Namespace.cpp
index 5eea4a60a50..7933bf549a8 100644
--- a/clang-tools-extra/test/clang-rename/Namespace.cpp
+++ b/clang-tools-extra/test/clang-rename/Namespace.cpp
@@ -1,6 +1,4 @@
-// RUN: cat %s > %t.cpp
-// RUN: clang-rename -offset=143 -new-name=llvm %t.cpp -i --
-// RUN: sed 's,//.*,,' %t.cpp | FileCheck %s
+// RUN: clang-rename -offset=79 -new-name=llvm %s -- | FileCheck %s
namespace foo { // CHECK: namespace llvm {
int x;
@@ -10,5 +8,5 @@ void boo() {
foo::x = 42; // CHECK: llvm::x = 42;
}
-// Use grep -FUbo 'foo;' <file> to get the correct offset of foo when changing
+// Use grep -FUbo 'foo' <file> to get the correct offset of foo when changing
// this file.
diff --git a/clang-tools-extra/test/clang-rename/ReinterpretCastExpr.cpp b/clang-tools-extra/test/clang-rename/ReinterpretCastExpr.cpp
index 2d5ecd2a014..277e465a97e 100644
--- a/clang-tools-extra/test/clang-rename/ReinterpretCastExpr.cpp
+++ b/clang-tools-extra/test/clang-rename/ReinterpretCastExpr.cpp
@@ -1,6 +1,5 @@
-// RUN: cat %s > %t.cpp
-// RUN: clang-rename -offset=133 -new-name=X %t.cpp -i --
-// RUN: sed 's,//.*,,' %t.cpp | FileCheck %s
+// RUN: clang-rename -offset=73 -new-name=X %s -- | FileCheck %s
+
class Cla {
public:
int getValue() const {
@@ -13,5 +12,5 @@ int main() {
reinterpret_cast<const Cla *>(C)->getValue(); // CHECK: reinterpret_cast<const X *>
}
-// Use grep -FUbo 'Cla' <file> to get the correct offset of foo when changing
+// Use grep -FUbo 'Cla' <file> to get the correct offset of Cla when changing
// this file.
diff --git a/clang-tools-extra/test/clang-rename/StaticCastExpr.cpp b/clang-tools-extra/test/clang-rename/StaticCastExpr.cpp
index b75102ab17e..c0f43251f99 100644
--- a/clang-tools-extra/test/clang-rename/StaticCastExpr.cpp
+++ b/clang-tools-extra/test/clang-rename/StaticCastExpr.cpp
@@ -1,6 +1,4 @@
-// RUN: cat %s > %t.cpp
-// RUN: clang-rename -offset=152 -new-name=Bar %t.cpp -i --
-// RUN: sed 's,//.*,,' %t.cpp | FileCheck %s
+// RUN: clang-rename -offset=91 -new-name=Bar %s -- | FileCheck %s
class Baz {
};
diff --git a/clang-tools-extra/test/clang-rename/TemplateFunctionFindByDeclaration.cpp b/clang-tools-extra/test/clang-rename/TemplateFunctionFindByDeclaration.cpp
index f6529024791..24343f09e77 100644
--- a/clang-tools-extra/test/clang-rename/TemplateFunctionFindByDeclaration.cpp
+++ b/clang-tools-extra/test/clang-rename/TemplateFunctionFindByDeclaration.cpp
@@ -1,6 +1,4 @@
-// RUN: cat %s > %t.cpp
-// RUN: clang-rename -offset=154 -new-name=bar %t.cpp -i --
-// RUN: sed 's,//.*,,' %t.cpp | FileCheck %s
+// RUN: clang-rename -offset=93 -new-name=bar %s -- | FileCheck %s
template <typename T>
T foo(T value) { // CHECK: T bar(T value) {
diff --git a/clang-tools-extra/test/clang-rename/TemplateFunctionFindByUse.cpp b/clang-tools-extra/test/clang-rename/TemplateFunctionFindByUse.cpp
index a3d1717e16b..7c57062d258 100644
--- a/clang-tools-extra/test/clang-rename/TemplateFunctionFindByUse.cpp
+++ b/clang-tools-extra/test/clang-rename/TemplateFunctionFindByUse.cpp
@@ -1,6 +1,4 @@
-// RUN: cat %s > %t.cpp
-// RUN: clang-rename -offset=233 -new-name=bar %t.cpp -i --
-// RUN: sed 's,//.*,,' %t.cpp | FileCheck %s
+// RUN: clang-rename -offset=172 -new-name=bar %s -- | FileCheck %s
template <typename T>
T foo(T value) { // CHECK: T bar(T value) {
diff --git a/clang-tools-extra/test/clang-rename/TemplateTypenameFindByTypeInside.cpp b/clang-tools-extra/test/clang-rename/TemplateTypenameFindByTypeInside.cpp
index a7d822b99a5..056bb2a41e3 100644
--- a/clang-tools-extra/test/clang-rename/TemplateTypenameFindByTypeInside.cpp
+++ b/clang-tools-extra/test/clang-rename/TemplateTypenameFindByTypeInside.cpp
@@ -1,6 +1,4 @@
-// RUN: cat %s > %t.cpp
-// RUN: clang-rename -offset=350 -new-name=U %t.cpp -i --
-// RUN: sed 's,//.*,,' %t.cpp | FileCheck %s
+// RUN: clang-rename -offset=289 -new-name=U %s -- | FileCheck %s
// Currently unsupported test.
// FIXME: clang-rename should be able to rename template parameters correctly.
diff --git a/clang-tools-extra/test/clang-rename/UserDefinedConversionFindByTypeDeclaration.cpp b/clang-tools-extra/test/clang-rename/UserDefinedConversionFindByTypeDeclaration.cpp
index 271a5663ae9..2c020e85c9e 100644
--- a/clang-tools-extra/test/clang-rename/UserDefinedConversionFindByTypeDeclaration.cpp
+++ b/clang-tools-extra/test/clang-rename/UserDefinedConversionFindByTypeDeclaration.cpp
@@ -1,6 +1,4 @@
-// RUN: cat %s > %t.cpp
-// RUN: clang-rename -offset=136 -new-name=Bar %t.cpp -i --
-// RUN: sed 's,//.*,,' %t.cpp | FileCheck %s
+// RUN: clang-rename -offset=75 -new-name=Bar %s -- | FileCheck %s
class Foo { // CHECK: class Bar {
// ^ offset must be here
@@ -22,5 +20,5 @@ int main() {
return 0;
}
-// Use grep -FUbo 'Foo' <file> to get the correct offset of Cla when changing
+// Use grep -FUbo 'Foo' <file> to get the correct offset of Foo when changing
// this file.
diff --git a/clang-tools-extra/test/clang-rename/Variable.cpp b/clang-tools-extra/test/clang-rename/Variable.cpp
index 02935bdb360..5d356ff5b21 100644
--- a/clang-tools-extra/test/clang-rename/Variable.cpp
+++ b/clang-tools-extra/test/clang-rename/Variable.cpp
@@ -1,6 +1,4 @@
-// RUN: cat %s > %t.cpp
-// RUN: clang-rename -offset=148 -new-name=Bar %t.cpp -i --
-// RUN: sed 's,//.*,,' %t.cpp | FileCheck %s
+// RUN: clang-rename -offset=87 -new-name=Bar %s -- | FileCheck %s
namespace A {
int Foo; // CHECK: int Bar;
@@ -23,5 +21,5 @@ void fun() {
Foo = b.Foo; // Foo = b.Foo;
}
-// Use grep -FUbo 'Foo' <file> to get the correct offset of foo when changing
+// Use grep -FUbo 'Foo' <file> to get the correct offset of Foo when changing
// this file.
diff --git a/clang-tools-extra/test/clang-rename/VariableMacro.cpp b/clang-tools-extra/test/clang-rename/VariableMacro.cpp
index 2a0cd870438..1b6c7ce099d 100644
--- a/clang-tools-extra/test/clang-rename/VariableMacro.cpp
+++ b/clang-tools-extra/test/clang-rename/VariableMacro.cpp
@@ -1,6 +1,4 @@
-// RUN: cat %s > %t.cpp
-// RUN: clang-rename -offset=208 -new-name=Z %t.cpp -i --
-// RUN: sed 's,//.*,,' %t.cpp | FileCheck %s
+// RUN: clang-rename -offset=147 -new-name=Z %s -- | FileCheck %s
#define Y X // CHECK: #define Y Z
@@ -14,5 +12,5 @@ void macro() {
foo(Y);
}
-// Use grep -FUbo 'foo;' <file> to get the correct offset of foo when changing
+// Use grep -FUbo 'X' <file> to get the correct offset of X when changing
// this file.
OpenPOWER on IntegriCloud