<div dir="ltr"><div class="gmail_extra"><div class="gmail_quote">On Wed, Jul 27, 2016 at 6:43 AM, Saleem Abdulrasool via cfe-commits <span dir="ltr"><<a href="mailto:cfe-commits@lists.llvm.org" target="_blank">cfe-commits@lists.llvm.org</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: compnerd<br>
Date: Tue Jul 26 23:43:15 2016<br>
New Revision: 276836<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=276836&view=rev" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project?rev=276836&view=rev</a><br>
Log:<br>
test: simplify commands, NFC<br>
<br>
Rather than copying the file and then doing an in-place edit, perform the<br>
replacements to stdout and pass the output to FileCheck directly.  Avoids<br>
unnecessary copying and seds.<br>
<br>
Modified:<br>
    clang-tools-extra/trunk/test/clang-rename/ClassAsTemplateArgumentFindByClass.cpp<br>
    clang-tools-extra/trunk/test/clang-rename/ClassAsTemplateArgumentFindByTemplateArgument.cpp<br>
    clang-tools-extra/trunk/test/clang-rename/ClassFindByName.cpp<br>
    clang-tools-extra/trunk/test/clang-rename/ClassNameInFunctionDefenition.cpp<br>
    clang-tools-extra/trunk/test/clang-rename/ClassSimpleRenaming.cpp<br>
    clang-tools-extra/trunk/test/clang-rename/ComplicatedClassType.cpp<br>
    clang-tools-extra/trunk/test/clang-rename/ConstCastExpr.cpp<br>
    clang-tools-extra/trunk/test/clang-rename/ConstructExpr.cpp<br>
    clang-tools-extra/trunk/test/clang-rename/CtorFindByDeclaration.cpp<br>
    clang-tools-extra/trunk/test/clang-rename/CtorFindByDefinition.cpp<br>
    clang-tools-extra/trunk/test/clang-rename/CtorInitializer.cpp<br>
    clang-tools-extra/trunk/test/clang-rename/DeclRefExpr.cpp<br>
    clang-tools-extra/trunk/test/clang-rename/DtorDeclaration.cpp<br>
    clang-tools-extra/trunk/test/clang-rename/DtorDefinition.cpp<br>
    clang-tools-extra/trunk/test/clang-rename/DynamicCastExpr.cpp<br>
    clang-tools-extra/trunk/test/clang-rename/Field.cpp<br>
    clang-tools-extra/trunk/test/clang-rename/FunctionMacro.cpp<br>
    clang-tools-extra/trunk/test/clang-rename/MemberExprMacro.cpp<br>
    clang-tools-extra/trunk/test/clang-rename/Namespace.cpp<br>
    clang-tools-extra/trunk/test/clang-rename/ReinterpretCastExpr.cpp<br>
    clang-tools-extra/trunk/test/clang-rename/StaticCastExpr.cpp<br>
    clang-tools-extra/trunk/test/clang-rename/TemplateFunctionFindByDeclaration.cpp<br>
    clang-tools-extra/trunk/test/clang-rename/TemplateFunctionFindByUse.cpp<br>
    clang-tools-extra/trunk/test/clang-rename/TemplateTypenameFindByTypeInside.cpp<br>
    clang-tools-extra/trunk/test/clang-rename/UserDefinedConversionFindByTypeDeclaration.cpp<br>
    clang-tools-extra/trunk/test/clang-rename/Variable.cpp<br>
    clang-tools-extra/trunk/test/clang-rename/VariableMacro.cpp<br>
<br>
Modified: clang-tools-extra/trunk/test/clang-rename/ClassAsTemplateArgumentFindByClass.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/test/clang-rename/ClassAsTemplateArgumentFindByClass.cpp?rev=276836&r1=276835&r2=276836&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/test/clang-rename/ClassAsTemplateArgumentFindByClass.cpp?rev=276836&r1=276835&r2=276836&view=diff</a><br>
==============================================================================<br>
--- clang-tools-extra/trunk/test/clang-rename/ClassAsTemplateArgumentFindByClass.cpp (original)<br>
+++ clang-tools-extra/trunk/test/clang-rename/ClassAsTemplateArgumentFindByClass.cpp Tue Jul 26 23:43:15 2016<br>
@@ -1,6 +1,4 @@<br>
-// RUN: cat %s > %t.cpp<br>
-// RUN: clang-rename -offset=136 -new-name=Bar %t.cpp -i --<br>
-// RUN: sed 's,//.*,,' %t.cpp | FileCheck %s<br>
+// RUN: clang-rename -offset=74 -new-name=Bar %s -- | FileCheck %s<br></blockquote><div><br></div><div>This patch changes behavior of the tests. Namely, it makes most tests pass even if clang-rename doesn't do anything. The reason is that the CHECK patterns that don't contain regular expressions will match with themselves (previously, `sed 's,//.*,,` would remove them).</div><div><br></div><div>Please revert or fix (or better revert and then post another patch for review).</div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
<br>
 class Foo {};   // CHECK: class Bar {};<br>
<br>
<br>
Modified: clang-tools-extra/trunk/test/clang-rename/ClassAsTemplateArgumentFindByTemplateArgument.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/test/clang-rename/ClassAsTemplateArgumentFindByTemplateArgument.cpp?rev=276836&r1=276835&r2=276836&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/test/clang-rename/ClassAsTemplateArgumentFindByTemplateArgument.cpp?rev=276836&r1=276835&r2=276836&view=diff</a><br>
==============================================================================<br>
--- clang-tools-extra/trunk/test/clang-rename/ClassAsTemplateArgumentFindByTemplateArgument.cpp (original)<br>
+++ clang-tools-extra/trunk/test/clang-rename/ClassAsTemplateArgumentFindByTemplateArgument.cpp Tue Jul 26 23:43:15 2016<br>
@@ -1,6 +1,4 @@<br>
-// RUN: cat %s > %t.cpp<br>
-// RUN: clang-rename -offset=304 -new-name=Bar %t.cpp -i --<br>
-// RUN: sed 's,//.*,,' %t.cpp | FileCheck %s<br>
+// RUN: clang-rename -offset=243 -new-name=Bar %s -- | FileCheck %s<br>
<br>
 class Foo {};   // CHECK: class Bar {};<br>
<br>
<br>
Modified: clang-tools-extra/trunk/test/clang-rename/ClassFindByName.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/test/clang-rename/ClassFindByName.cpp?rev=276836&r1=276835&r2=276836&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/test/clang-rename/ClassFindByName.cpp?rev=276836&r1=276835&r2=276836&view=diff</a><br>
==============================================================================<br>
--- clang-tools-extra/trunk/test/clang-rename/ClassFindByName.cpp (original)<br>
+++ clang-tools-extra/trunk/test/clang-rename/ClassFindByName.cpp Tue Jul 26 23:43:15 2016<br>
@@ -1,6 +1,4 @@<br>
-// RUN: cat %s > %t.cpp<br>
-// RUN: clang-rename -old-name=Foo -new-name=Bar %t.cpp -i --<br>
-// RUN: sed 's,//.*,,' %t.cpp | FileCheck %s<br>
+// RUN: clang-rename -old-name=Foo -new-name=Bar %s -- | FileCheck %s<br>
<br>
 class Foo {         // CHECK: class Bar<br>
 };<br>
<br>
Modified: clang-tools-extra/trunk/test/clang-rename/ClassNameInFunctionDefenition.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/test/clang-rename/ClassNameInFunctionDefenition.cpp?rev=276836&r1=276835&r2=276836&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/test/clang-rename/ClassNameInFunctionDefenition.cpp?rev=276836&r1=276835&r2=276836&view=diff</a><br>
==============================================================================<br>
--- clang-tools-extra/trunk/test/clang-rename/ClassNameInFunctionDefenition.cpp (original)<br>
+++ clang-tools-extra/trunk/test/clang-rename/ClassNameInFunctionDefenition.cpp Tue Jul 26 23:43:15 2016<br>
@@ -1,6 +1,4 @@<br>
-// RUN: cat %s > %t.cpp<br>
-// RUN: clang-rename -offset=136 -new-name=Bar %t.cpp -i --<br>
-// RUN: sed 's,//.*,,' %t.cpp | FileCheck %s<br>
+// RUN: clang-rename -offset=74 -new-name=Bar %s -- | FileCheck %s<br>
<br>
 class Foo {             // CHECK: class Bar {<br>
 public:<br>
<br>
Modified: clang-tools-extra/trunk/test/clang-rename/ClassSimpleRenaming.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/test/clang-rename/ClassSimpleRenaming.cpp?rev=276836&r1=276835&r2=276836&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/test/clang-rename/ClassSimpleRenaming.cpp?rev=276836&r1=276835&r2=276836&view=diff</a><br>
==============================================================================<br>
--- clang-tools-extra/trunk/test/clang-rename/ClassSimpleRenaming.cpp (original)<br>
+++ clang-tools-extra/trunk/test/clang-rename/ClassSimpleRenaming.cpp Tue Jul 26 23:43:15 2016<br>
@@ -1,6 +1,4 @@<br>
-// RUN: cat %s > %t.cpp<br>
-// RUN: clang-rename -offset=136 -new-name=Bar %t.cpp -i --<br>
-// RUN: sed 's,//.*,,' %t.cpp | FileCheck %s<br>
+// RUN: clang-rename -offset=74 -new-name=Bar %s -- | FileCheck %s<br>
<br>
 class Foo {};       // CHECK: class Bar<br>
<br>
@@ -9,5 +7,5 @@ int main() {<br>
   return 0;<br>
 }<br>
<br>
-// Use grep -FUbo 'Foo' <file> to get the correct offset of Cla when changing<br>
+// Use grep -FUbo 'Foo' <file> to get the correct offset of Foo when changing<br>
 // this file.<br>
<br>
Modified: clang-tools-extra/trunk/test/clang-rename/ComplicatedClassType.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/test/clang-rename/ComplicatedClassType.cpp?rev=276836&r1=276835&r2=276836&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/test/clang-rename/ComplicatedClassType.cpp?rev=276836&r1=276835&r2=276836&view=diff</a><br>
==============================================================================<br>
--- clang-tools-extra/trunk/test/clang-rename/ComplicatedClassType.cpp (original)<br>
+++ clang-tools-extra/trunk/test/clang-rename/ComplicatedClassType.cpp Tue Jul 26 23:43:15 2016<br>
@@ -1,6 +1,4 @@<br>
-// RUN: cat %s > %t.cpp<br>
-// RUN: clang-rename -offset=220 -new-name=Bar %t.cpp -i --<br>
-// RUN: sed 's,//.*,,' %t.cpp | FileCheck %s<br>
+// RUN: clang-rename -offset=159 -new-name=Bar %s -- | FileCheck %s<br>
<br>
 // Forward declaration.<br>
 class Foo;                            // CHECK: class Bar;<br>
<br>
Modified: clang-tools-extra/trunk/test/clang-rename/ConstCastExpr.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/test/clang-rename/ConstCastExpr.cpp?rev=276836&r1=276835&r2=276836&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/test/clang-rename/ConstCastExpr.cpp?rev=276836&r1=276835&r2=276836&view=diff</a><br>
==============================================================================<br>
--- clang-tools-extra/trunk/test/clang-rename/ConstCastExpr.cpp (original)<br>
+++ clang-tools-extra/trunk/test/clang-rename/ConstCastExpr.cpp Tue Jul 26 23:43:15 2016<br>
@@ -1,6 +1,4 @@<br>
-// RUN: cat %s > %t.cpp<br>
-// RUN: clang-rename -offset=136 -new-name=Bar %t.cpp -i --<br>
-// RUN: sed 's,//.*,,' %t.cpp | FileCheck %s<br>
+// RUN: clang-rename -offset=74 -new-name=Bar %s -- | FileCheck %s<br>
<br>
 class Foo {                         // CHECK: class Bar {<br>
 public:<br>
@@ -14,5 +12,5 @@ int main() {<br>
   const_cast<Foo *>(C)->getValue(); // CHECK: const_cast<Bar *>(C)->getValue();<br>
 }<br>
<br>
-// Use grep -FUbo 'Cla' <file> to get the correct offset of foo when changing<br>
+// Use grep -FUbo 'Foo' <file> to get the correct offset of Foo when changing<br>
 // this file.<br>
<br>
Modified: clang-tools-extra/trunk/test/clang-rename/ConstructExpr.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/test/clang-rename/ConstructExpr.cpp?rev=276836&r1=276835&r2=276836&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/test/clang-rename/ConstructExpr.cpp?rev=276836&r1=276835&r2=276836&view=diff</a><br>
==============================================================================<br>
--- clang-tools-extra/trunk/test/clang-rename/ConstructExpr.cpp (original)<br>
+++ clang-tools-extra/trunk/test/clang-rename/ConstructExpr.cpp Tue Jul 26 23:43:15 2016<br>
@@ -1,6 +1,4 @@<br>
-// RUN: cat %s > %t.cpp<br>
-// RUN: clang-rename -offset=136 -new-name=Boo %t.cpp -i --<br>
-// RUN: sed 's,//.*,,' %t.cpp | FileCheck %s<br>
+// RUN: clang-rename -offset=74 -new-name=Boo %s -- | FileCheck %s<br>
<br>
 class Foo {};         // CHECK: class Boo {};<br>
<br>
@@ -8,5 +6,5 @@ int main() {<br>
   Foo *C = new Foo(); // CHECK: Boo *C = new Boo();<br>
 }<br>
<br>
-// Use grep -FUbo 'Boo' <file> to get the correct offset of foo when changing<br>
+// Use grep -FUbo 'Foo' <file> to get the correct offset of Foo when changing<br>
 // this file.<br>
<br>
Modified: clang-tools-extra/trunk/test/clang-rename/CtorFindByDeclaration.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/test/clang-rename/CtorFindByDeclaration.cpp?rev=276836&r1=276835&r2=276836&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/test/clang-rename/CtorFindByDeclaration.cpp?rev=276836&r1=276835&r2=276836&view=diff</a><br>
==============================================================================<br>
--- clang-tools-extra/trunk/test/clang-rename/CtorFindByDeclaration.cpp (original)<br>
+++ clang-tools-extra/trunk/test/clang-rename/CtorFindByDeclaration.cpp Tue Jul 26 23:43:15 2016<br>
@@ -1,6 +1,4 @@<br>
-// RUN: cat %s > %t.cpp<br>
-// RUN: clang-rename -offset=174 -new-name=Bar %t.cpp -i --<br>
-// RUN: sed 's,//.*,,' %t.cpp | FileCheck %s<br>
+// RUN: clang-rename -offset=113 -new-name=Bar %s -- | FileCheck %s<br>
<br>
 class Foo {   // CHECK: class Bar<br>
 public:<br>
@@ -9,5 +7,5 @@ public:<br>
<br>
 Foo::Foo() {} // CHECK: Bar::Bar()<br>
<br>
-// Use grep -FUbo 'C' <file> to get the correct offset of foo when changing<br>
+// Use grep -FUbo 'Foo' <file> to get the correct offset of Foo when changing<br>
 // this file.<br>
<br>
Modified: clang-tools-extra/trunk/test/clang-rename/CtorFindByDefinition.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/test/clang-rename/CtorFindByDefinition.cpp?rev=276836&r1=276835&r2=276836&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/test/clang-rename/CtorFindByDefinition.cpp?rev=276836&r1=276835&r2=276836&view=diff</a><br>
==============================================================================<br>
--- clang-tools-extra/trunk/test/clang-rename/CtorFindByDefinition.cpp (original)<br>
+++ clang-tools-extra/trunk/test/clang-rename/CtorFindByDefinition.cpp Tue Jul 26 23:43:15 2016<br>
@@ -1,6 +1,4 @@<br>
-// RUN: cat %s > %t.cpp<br>
-// RUN: clang-rename -offset=212 -new-name=Bar %t.cpp -i --<br>
-// RUN: sed 's,//.*,,' %t.cpp | FileCheck %s<br>
+// RUN: clang-rename -offset=151 -new-name=Bar %s -- | FileCheck %s<br>
<br>
 class Foo {   // CHECK: class Bar<br>
 public:<br>
@@ -9,5 +7,5 @@ public:<br>
<br>
 Foo::Foo() {} // CHECK: Bar::Bar()<br>
<br>
-// Use grep -FUbo 'C' <file> to get the correct offset of foo when changing<br>
+// Use grep -FUbo 'Foo' <file> to get the correct offset of Foo when changing<br>
 // this file.<br>
<br>
Modified: clang-tools-extra/trunk/test/clang-rename/CtorInitializer.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/test/clang-rename/CtorInitializer.cpp?rev=276836&r1=276835&r2=276836&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/test/clang-rename/CtorInitializer.cpp?rev=276836&r1=276835&r2=276836&view=diff</a><br>
==============================================================================<br>
--- clang-tools-extra/trunk/test/clang-rename/CtorInitializer.cpp (original)<br>
+++ clang-tools-extra/trunk/test/clang-rename/CtorInitializer.cpp Tue Jul 26 23:43:15 2016<br>
@@ -1,6 +1,4 @@<br>
-// RUN: cat %s > %t.cpp<br>
-// RUN: clang-rename -offset=163 -new-name=Bar %t.cpp -i --<br>
-// RUN: sed 's,//.*,,' %t.cpp | FileCheck %s<br>
+// RUN: clang-rename -offset=102 -new-name=Bar %s -- | FileCheck %s<br>
<br>
 class Baz {};<br>
<br>
<br>
Modified: clang-tools-extra/trunk/test/clang-rename/DeclRefExpr.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/test/clang-rename/DeclRefExpr.cpp?rev=276836&r1=276835&r2=276836&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/test/clang-rename/DeclRefExpr.cpp?rev=276836&r1=276835&r2=276836&view=diff</a><br>
==============================================================================<br>
--- clang-tools-extra/trunk/test/clang-rename/DeclRefExpr.cpp (original)<br>
+++ clang-tools-extra/trunk/test/clang-rename/DeclRefExpr.cpp Tue Jul 26 23:43:15 2016<br>
@@ -1,6 +1,4 @@<br>
-// RUN: cat %s > %t.cpp<br>
-// RUN: clang-rename -offset=161 -new-name=Bar %t.cpp -i --<br>
-// RUN: sed 's,//.*,,' %t.cpp | FileCheck %s<br>
+// RUN: clang-rename -offset=100 -new-name=Bar %s -- | FileCheck %s<br>
<br>
 class C {<br>
 public:<br>
@@ -16,5 +14,5 @@ int main() {<br>
   int y = C::Foo; // CHECK: C::Bar<br>
 }<br>
<br>
-// Use grep -FUbo 'X' <file> to get the correct offset of foo when changing<br>
+// Use grep -FUbo 'Foo' <file> to get the correct offset of Foo when changing<br>
 // this file.<br>
<br>
Modified: clang-tools-extra/trunk/test/clang-rename/DtorDeclaration.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/test/clang-rename/DtorDeclaration.cpp?rev=276836&r1=276835&r2=276836&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/test/clang-rename/DtorDeclaration.cpp?rev=276836&r1=276835&r2=276836&view=diff</a><br>
==============================================================================<br>
--- clang-tools-extra/trunk/test/clang-rename/DtorDeclaration.cpp (original)<br>
+++ clang-tools-extra/trunk/test/clang-rename/DtorDeclaration.cpp Tue Jul 26 23:43:15 2016<br>
@@ -1,6 +1,4 @@<br>
-// RUN: cat %s > %t.cpp<br>
-// RUN: clang-rename -offset=175 -new-name=Bar %t.cpp -i --<br>
-// RUN: sed 's,//.*,,' %t.cpp | FileCheck %s<br>
+// RUN: clang-rename -offset=114 -new-name=Bar %s -- | FileCheck %s<br>
<br>
 class Foo { // CHECK: class Bar {<br>
 public:<br>
@@ -10,5 +8,5 @@ public:<br>
 Foo::~Foo() { // CHECK: Bar::~Bar()<br>
 }<br>
<br>
-// Use grep -FUbo 'Bar' <file> to get the correct offset of foo when changing<br>
+// Use grep -FUbo 'Foo' <file> to get the correct offset of Foo when changing<br>
 // this file.<br>
<br>
Modified: clang-tools-extra/trunk/test/clang-rename/DtorDefinition.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/test/clang-rename/DtorDefinition.cpp?rev=276836&r1=276835&r2=276836&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/test/clang-rename/DtorDefinition.cpp?rev=276836&r1=276835&r2=276836&view=diff</a><br>
==============================================================================<br>
--- clang-tools-extra/trunk/test/clang-rename/DtorDefinition.cpp (original)<br>
+++ clang-tools-extra/trunk/test/clang-rename/DtorDefinition.cpp Tue Jul 26 23:43:15 2016<br>
@@ -1,6 +1,4 @@<br>
-// RUN: cat %s > %t.cpp<br>
-// RUN: clang-rename -offset=219 -new-name=Bar %t.cpp -i --<br>
-// RUN: sed 's,//.*,,' %t.cpp | FileCheck %s<br>
+// RUN: clang-rename -offset=158 -new-name=Bar %s -- | FileCheck %s<br>
<br>
 class Foo {     // CHECK: class Bar {<br>
 public:<br>
@@ -10,5 +8,5 @@ public:<br>
 Foo::~Foo() {}  // CHECK: Bar::~Bar()<br>
<br>
<br>
-// Use grep -FUbo 'Foo' <file> to get the correct offset of foo when changing<br>
+// Use grep -FUbo 'Foo' <file> to get the correct offset of Foo when changing<br>
 // this file.<br>
<br>
Modified: clang-tools-extra/trunk/test/clang-rename/DynamicCastExpr.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/test/clang-rename/DynamicCastExpr.cpp?rev=276836&r1=276835&r2=276836&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/test/clang-rename/DynamicCastExpr.cpp?rev=276836&r1=276835&r2=276836&view=diff</a><br>
==============================================================================<br>
--- clang-tools-extra/trunk/test/clang-rename/DynamicCastExpr.cpp (original)<br>
+++ clang-tools-extra/trunk/test/clang-rename/DynamicCastExpr.cpp Tue Jul 26 23:43:15 2016<br>
@@ -1,6 +1,4 @@<br>
-// RUN: cat %s > %t.cpp<br>
-// RUN: clang-rename -offset=195 -new-name=Bar %t.cpp -i -- -frtti<br>
-// RUN: sed 's,//.*,,' %t.cpp | FileCheck %s<br>
+// RUN: clang-rename -offset=134 -new-name=Bar %s -- -frtti | FileCheck %s<br>
<br>
 class Baz {<br>
   virtual int getValue() const = 0;<br>
@@ -22,5 +20,5 @@ int main() {<br>
   dynamic_cast<const Foo *>(Pointer)->getValue();  // CHECK: dynamic_cast<const Bar *>(Pointer)->getValue();<br>
 }<br>
<br>
-// Use grep -FUbo 'Foo' <file> to get the correct offset of foo when changing<br>
+// Use grep -FUbo 'Foo' <file> to get the correct offset of Foo when changing<br>
 // this file.<br>
<br>
Modified: clang-tools-extra/trunk/test/clang-rename/Field.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/test/clang-rename/Field.cpp?rev=276836&r1=276835&r2=276836&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/test/clang-rename/Field.cpp?rev=276836&r1=276835&r2=276836&view=diff</a><br>
==============================================================================<br>
--- clang-tools-extra/trunk/test/clang-rename/Field.cpp (original)<br>
+++ clang-tools-extra/trunk/test/clang-rename/Field.cpp Tue Jul 26 23:43:15 2016<br>
@@ -1,6 +1,4 @@<br>
-// RUN: cat %s > %t.cpp<br>
-// RUN: clang-rename -offset=148 -new-name=Bar %t.cpp -i --<br>
-// RUN: sed 's,//.*,,' %t.cpp | FileCheck %s<br>
+// RUN: clang-rename -offset=87 -new-name=Bar %s -- | FileCheck %s<br>
<br>
 class Baz {<br>
   int Foo;              // CHECK: Bar;<br>
<br>
Modified: clang-tools-extra/trunk/test/clang-rename/FunctionMacro.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/test/clang-rename/FunctionMacro.cpp?rev=276836&r1=276835&r2=276836&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/test/clang-rename/FunctionMacro.cpp?rev=276836&r1=276835&r2=276836&view=diff</a><br>
==============================================================================<br>
--- clang-tools-extra/trunk/test/clang-rename/FunctionMacro.cpp (original)<br>
+++ clang-tools-extra/trunk/test/clang-rename/FunctionMacro.cpp Tue Jul 26 23:43:15 2016<br>
@@ -1,6 +1,4 @@<br>
-// RUN: cat %s > %t.cpp<br>
-// RUN: clang-rename -offset=199 -new-name=macro_function %t.cpp -i --<br>
-// RUN: sed 's,//.*,,' %t.cpp | FileCheck %s<br>
+// RUN: clang-rename -offset=138 -new-name=macro_function %s -- | FileCheck %s<br>
<br>
 #define moo foo // CHECK: #define moo macro_function<br>
<br>
@@ -17,5 +15,5 @@ void qoo() {<br>
   boo(moo());<br>
 }<br>
<br>
-// Use grep -FUbo 'foo;' <file> to get the correct offset of foo when changing<br>
+// Use grep -FUbo 'foo' <file> to get the correct offset of foo when changing<br>
 // this file.<br>
<br>
Modified: clang-tools-extra/trunk/test/clang-rename/MemberExprMacro.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/test/clang-rename/MemberExprMacro.cpp?rev=276836&r1=276835&r2=276836&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/test/clang-rename/MemberExprMacro.cpp?rev=276836&r1=276835&r2=276836&view=diff</a><br>
==============================================================================<br>
--- clang-tools-extra/trunk/test/clang-rename/MemberExprMacro.cpp (original)<br>
+++ clang-tools-extra/trunk/test/clang-rename/MemberExprMacro.cpp Tue Jul 26 23:43:15 2016<br>
@@ -1,6 +1,4 @@<br>
-// RUN: cat %s > %t.cpp<br>
-// RUN: clang-rename -offset=156 -new-name=Bar %t.cpp -i --<br>
-// RUN: sed 's,//.*,,' %t.cpp | FileCheck %s<br>
+// RUN: clang-rename -offset=95 -new-name=Bar %s -- | FileCheck %s<br>
<br>
 class Baz {<br>
 public:<br>
<br>
Modified: clang-tools-extra/trunk/test/clang-rename/Namespace.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/test/clang-rename/Namespace.cpp?rev=276836&r1=276835&r2=276836&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/test/clang-rename/Namespace.cpp?rev=276836&r1=276835&r2=276836&view=diff</a><br>
==============================================================================<br>
--- clang-tools-extra/trunk/test/clang-rename/Namespace.cpp (original)<br>
+++ clang-tools-extra/trunk/test/clang-rename/Namespace.cpp Tue Jul 26 23:43:15 2016<br>
@@ -1,6 +1,4 @@<br>
-// RUN: cat %s > %t.cpp<br>
-// RUN: clang-rename -offset=143 -new-name=llvm %t.cpp -i --<br>
-// RUN: sed 's,//.*,,' %t.cpp | FileCheck %s<br>
+// RUN: clang-rename -offset=79 -new-name=llvm %s -- | FileCheck %s<br>
<br>
 namespace foo { // CHECK: namespace llvm {<br>
   int x;<br>
@@ -10,5 +8,5 @@ void boo() {<br>
   foo::x = 42;  // CHECK: llvm::x = 42;<br>
 }<br>
<br>
-// Use grep -FUbo 'foo;' <file> to get the correct offset of foo when changing<br>
+// Use grep -FUbo 'foo' <file> to get the correct offset of foo when changing<br>
 // this file.<br>
<br>
Modified: clang-tools-extra/trunk/test/clang-rename/ReinterpretCastExpr.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/test/clang-rename/ReinterpretCastExpr.cpp?rev=276836&r1=276835&r2=276836&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/test/clang-rename/ReinterpretCastExpr.cpp?rev=276836&r1=276835&r2=276836&view=diff</a><br>
==============================================================================<br>
--- clang-tools-extra/trunk/test/clang-rename/ReinterpretCastExpr.cpp (original)<br>
+++ clang-tools-extra/trunk/test/clang-rename/ReinterpretCastExpr.cpp Tue Jul 26 23:43:15 2016<br>
@@ -1,6 +1,5 @@<br>
-// RUN: cat %s > %t.cpp<br>
-// RUN: clang-rename -offset=133 -new-name=X %t.cpp -i --<br>
-// RUN: sed 's,//.*,,' %t.cpp | FileCheck %s<br>
+// RUN: clang-rename -offset=73 -new-name=X %s -- | FileCheck %s<br>
+<br>
 class Cla {<br>
 public:<br>
   int getValue() const {<br>
@@ -13,5 +12,5 @@ int main() {<br>
   reinterpret_cast<const Cla *>(C)->getValue(); // CHECK: reinterpret_cast<const X *><br>
 }<br>
<br>
-// Use grep -FUbo 'Cla' <file> to get the correct offset of foo when changing<br>
+// Use grep -FUbo 'Cla' <file> to get the correct offset of Cla when changing<br>
 // this file.<br>
<br>
Modified: clang-tools-extra/trunk/test/clang-rename/StaticCastExpr.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/test/clang-rename/StaticCastExpr.cpp?rev=276836&r1=276835&r2=276836&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/test/clang-rename/StaticCastExpr.cpp?rev=276836&r1=276835&r2=276836&view=diff</a><br>
==============================================================================<br>
--- clang-tools-extra/trunk/test/clang-rename/StaticCastExpr.cpp (original)<br>
+++ clang-tools-extra/trunk/test/clang-rename/StaticCastExpr.cpp Tue Jul 26 23:43:15 2016<br>
@@ -1,6 +1,4 @@<br>
-// RUN: cat %s > %t.cpp<br>
-// RUN: clang-rename -offset=152 -new-name=Bar %t.cpp -i --<br>
-// RUN: sed 's,//.*,,' %t.cpp | FileCheck %s<br>
+// RUN: clang-rename -offset=91 -new-name=Bar %s -- | FileCheck %s<br>
<br>
 class Baz {<br>
 };<br>
<br>
Modified: clang-tools-extra/trunk/test/clang-rename/TemplateFunctionFindByDeclaration.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/test/clang-rename/TemplateFunctionFindByDeclaration.cpp?rev=276836&r1=276835&r2=276836&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/test/clang-rename/TemplateFunctionFindByDeclaration.cpp?rev=276836&r1=276835&r2=276836&view=diff</a><br>
==============================================================================<br>
--- clang-tools-extra/trunk/test/clang-rename/TemplateFunctionFindByDeclaration.cpp (original)<br>
+++ clang-tools-extra/trunk/test/clang-rename/TemplateFunctionFindByDeclaration.cpp Tue Jul 26 23:43:15 2016<br>
@@ -1,6 +1,4 @@<br>
-// RUN: cat %s > %t.cpp<br>
-// RUN: clang-rename -offset=154 -new-name=bar %t.cpp -i --<br>
-// RUN: sed 's,//.*,,' %t.cpp | FileCheck %s<br>
+// RUN: clang-rename -offset=93 -new-name=bar %s -- | FileCheck %s<br>
<br>
 template <typename T><br>
 T foo(T value) {    // CHECK: T bar(T value) {<br>
<br>
Modified: clang-tools-extra/trunk/test/clang-rename/TemplateFunctionFindByUse.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/test/clang-rename/TemplateFunctionFindByUse.cpp?rev=276836&r1=276835&r2=276836&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/test/clang-rename/TemplateFunctionFindByUse.cpp?rev=276836&r1=276835&r2=276836&view=diff</a><br>
==============================================================================<br>
--- clang-tools-extra/trunk/test/clang-rename/TemplateFunctionFindByUse.cpp (original)<br>
+++ clang-tools-extra/trunk/test/clang-rename/TemplateFunctionFindByUse.cpp Tue Jul 26 23:43:15 2016<br>
@@ -1,6 +1,4 @@<br>
-// RUN: cat %s > %t.cpp<br>
-// RUN: clang-rename -offset=233 -new-name=bar %t.cpp -i --<br>
-// RUN: sed 's,//.*,,' %t.cpp | FileCheck %s<br>
+// RUN: clang-rename -offset=172 -new-name=bar %s -- | FileCheck %s<br>
<br>
 template <typename T><br>
 T foo(T value) {    // CHECK: T bar(T value) {<br>
<br>
Modified: clang-tools-extra/trunk/test/clang-rename/TemplateTypenameFindByTypeInside.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/test/clang-rename/TemplateTypenameFindByTypeInside.cpp?rev=276836&r1=276835&r2=276836&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/test/clang-rename/TemplateTypenameFindByTypeInside.cpp?rev=276836&r1=276835&r2=276836&view=diff</a><br>
==============================================================================<br>
--- clang-tools-extra/trunk/test/clang-rename/TemplateTypenameFindByTypeInside.cpp (original)<br>
+++ clang-tools-extra/trunk/test/clang-rename/TemplateTypenameFindByTypeInside.cpp Tue Jul 26 23:43:15 2016<br>
@@ -1,6 +1,4 @@<br>
-// RUN: cat %s > %t.cpp<br>
-// RUN: clang-rename -offset=350 -new-name=U %t.cpp -i --<br>
-// RUN: sed 's,//.*,,' %t.cpp | FileCheck %s<br>
+// RUN: clang-rename -offset=289 -new-name=U %s -- | FileCheck %s<br>
<br>
 // Currently unsupported test.<br>
 // FIXME: clang-rename should be able to rename template parameters correctly.<br>
<br>
Modified: clang-tools-extra/trunk/test/clang-rename/UserDefinedConversionFindByTypeDeclaration.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/test/clang-rename/UserDefinedConversionFindByTypeDeclaration.cpp?rev=276836&r1=276835&r2=276836&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/test/clang-rename/UserDefinedConversionFindByTypeDeclaration.cpp?rev=276836&r1=276835&r2=276836&view=diff</a><br>
==============================================================================<br>
--- clang-tools-extra/trunk/test/clang-rename/UserDefinedConversionFindByTypeDeclaration.cpp (original)<br>
+++ clang-tools-extra/trunk/test/clang-rename/UserDefinedConversionFindByTypeDeclaration.cpp Tue Jul 26 23:43:15 2016<br>
@@ -1,6 +1,4 @@<br>
-// RUN: cat %s > %t.cpp<br>
-// RUN: clang-rename -offset=136 -new-name=Bar %t.cpp -i --<br>
-// RUN: sed 's,//.*,,' %t.cpp | FileCheck %s<br>
+// RUN: clang-rename -offset=75 -new-name=Bar %s -- | FileCheck %s<br>
<br>
 class Foo {                         // CHECK: class Bar {<br>
 //    ^ offset must be here<br>
@@ -22,5 +20,5 @@ int main() {<br>
   return 0;<br>
 }<br>
<br>
-// Use grep -FUbo 'Foo' <file> to get the correct offset of Cla when changing<br>
+// Use grep -FUbo 'Foo' <file> to get the correct offset of Foo when changing<br>
 // this file.<br>
<br>
Modified: clang-tools-extra/trunk/test/clang-rename/Variable.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/test/clang-rename/Variable.cpp?rev=276836&r1=276835&r2=276836&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/test/clang-rename/Variable.cpp?rev=276836&r1=276835&r2=276836&view=diff</a><br>
==============================================================================<br>
--- clang-tools-extra/trunk/test/clang-rename/Variable.cpp (original)<br>
+++ clang-tools-extra/trunk/test/clang-rename/Variable.cpp Tue Jul 26 23:43:15 2016<br>
@@ -1,6 +1,4 @@<br>
-// RUN: cat %s > %t.cpp<br>
-// RUN: clang-rename -offset=148 -new-name=Bar %t.cpp -i --<br>
-// RUN: sed 's,//.*,,' %t.cpp | FileCheck %s<br>
+// RUN: clang-rename -offset=87 -new-name=Bar %s -- | FileCheck %s<br>
<br>
 namespace A {<br>
 int Foo;                // CHECK: int Bar;<br>
@@ -23,5 +21,5 @@ void fun() {<br>
   Foo = b.Foo;          // Foo = b.Foo;<br>
 }<br>
<br>
-// Use grep -FUbo 'Foo' <file> to get the correct offset of foo when changing<br>
+// Use grep -FUbo 'Foo' <file> to get the correct offset of Foo when changing<br>
 // this file.<br>
<br>
Modified: clang-tools-extra/trunk/test/clang-rename/VariableMacro.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/test/clang-rename/VariableMacro.cpp?rev=276836&r1=276835&r2=276836&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/test/clang-rename/VariableMacro.cpp?rev=276836&r1=276835&r2=276836&view=diff</a><br>
==============================================================================<br>
--- clang-tools-extra/trunk/test/clang-rename/VariableMacro.cpp (original)<br>
+++ clang-tools-extra/trunk/test/clang-rename/VariableMacro.cpp Tue Jul 26 23:43:15 2016<br>
@@ -1,6 +1,4 @@<br>
-// RUN: cat %s > %t.cpp<br>
-// RUN: clang-rename -offset=208 -new-name=Z %t.cpp -i --<br>
-// RUN: sed 's,//.*,,' %t.cpp | FileCheck %s<br>
+// RUN: clang-rename -offset=147 -new-name=Z %s -- | FileCheck %s<br>
<br>
 #define Y X // CHECK: #define Y Z<br>
<br>
@@ -14,5 +12,5 @@ void macro() {<br>
   foo(Y);<br>
 }<br>
<br>
-// Use grep -FUbo 'foo;' <file> to get the correct offset of foo when changing<br>
+// Use grep -FUbo 'X' <file> to get the correct offset of X when changing<br>
 // this file.<br>
<br>
<br>
_______________________________________________<br>
cfe-commits mailing list<br>
<a href="mailto:cfe-commits@lists.llvm.org">cfe-commits@lists.llvm.org</a><br>
<a href="http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits" rel="noreferrer" target="_blank">http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits</a><br>
</blockquote></div><br></div></div>