[clang-tools-extra] r196559 - clang-tools-extra/test/clang-modernize/HeaderReplacements/main.cpp: Dequote safe chars rather than hairy quoting.

NAKAMURA Takumi geek4civic at gmail.com
Thu Dec 5 18:00:41 PST 2013


Author: chapuni
Date: Thu Dec  5 20:00:41 2013
New Revision: 196559

URL: http://llvm.org/viewvc/llvm-project?rev=196559&view=rev
Log:
clang-tools-extra/test/clang-modernize/HeaderReplacements/main.cpp: Dequote safe chars rather than hairy quoting.

Thanks to Lang, to let me noticed.

Modified:
    clang-tools-extra/trunk/test/clang-modernize/HeaderReplacements/common_expected.yaml
    clang-tools-extra/trunk/test/clang-modernize/HeaderReplacements/main.cpp
    clang-tools-extra/trunk/test/clang-modernize/HeaderReplacements/main_expected.yaml

Modified: clang-tools-extra/trunk/test/clang-modernize/HeaderReplacements/common_expected.yaml
URL: http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/test/clang-modernize/HeaderReplacements/common_expected.yaml?rev=196559&r1=196558&r2=196559&view=diff
==============================================================================
--- clang-tools-extra/trunk/test/clang-modernize/HeaderReplacements/common_expected.yaml (original)
+++ clang-tools-extra/trunk/test/clang-modernize/HeaderReplacements/common_expected.yaml Thu Dec  5 20:00:41 2013
@@ -1,19 +1,19 @@
 ---
-MainSourceFile:  $(path)/common.cpp
+MainSourceFile:  '$(path)/common.cpp'
 Replacements:    
-  - FilePath:        $(path)/common.h
+  - FilePath:        '$(path)/common.h'
     Offset:          506
     Length:          2
     ReplacementText: elem
-  - FilePath:        $(path)/common.h
+  - FilePath:        '$(path)/common.h'
     Offset:          432
     Length:          61
     ReplacementText: '(auto & elem : C)'
-  - FilePath:        $(path)/common.cpp
+  - FilePath:        '$(path)/common.cpp'
     Offset:          289
     Length:          2
     ReplacementText: elem
-  - FilePath:        $(path)/common.cpp
+  - FilePath:        '$(path)/common.cpp'
     Offset:          206
     Length:          63
     ReplacementText: '(auto & elem : C1)'

Modified: clang-tools-extra/trunk/test/clang-modernize/HeaderReplacements/main.cpp
URL: http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/test/clang-modernize/HeaderReplacements/main.cpp?rev=196559&r1=196558&r2=196559&view=diff
==============================================================================
--- clang-tools-extra/trunk/test/clang-modernize/HeaderReplacements/main.cpp (original)
+++ clang-tools-extra/trunk/test/clang-modernize/HeaderReplacements/main.cpp Thu Dec  5 20:00:41 2013
@@ -12,10 +12,10 @@
 // RUN: ls -1 %T/SerializeTest | FileCheck %s --check-prefix=MAIN_CPP
 // RUN: ls -1 %T/SerializeTest | FileCheck %s --check-prefix=COMMON_CPP
 // We need to put the build path to the expected YAML file to diff against the generated one.
-// RUN: sed -e 's#$(path)#%/T/SerializeTest#g' -e "s#\([A-Z]:/.*\.[chp]*\)#'\1'#g" %S/main_expected.yaml > %T/SerializeTest/main_expected.yaml
+// RUN: sed -e 's#$(path)#%/T/SerializeTest#g' -e "s#[^[:space:]]'[^[:space:]]#''#g" -e "s#'\([-a-zA-Z0-9_/^., \t]*\)'#\1#g" %S/main_expected.yaml > %T/SerializeTest/main_expected.yaml
 // RUN: sed -i -e 's#\\#/#g' %T/SerializeTest/main.cpp_*.yaml
 // RUN: diff -b %T/SerializeTest/main_expected.yaml %T/SerializeTest/main.cpp_*.yaml
-// RUN: sed -e 's#$(path)#%/T/SerializeTest#g' -e "s#\([A-Z]:/.*\.[chp]*\)#'\1'#g" %S/common_expected.yaml > %T/SerializeTest/common_expected.yaml
+// RUN: sed -e 's#$(path)#%/T/SerializeTest#g' -e "s#[^[:space:]]'[^[:space:]]#''#g" -e "s#'\([-a-zA-Z0-9_/^., \t]*\)'#\1#g" %S/common_expected.yaml > %T/SerializeTest/common_expected.yaml
 // RUN: sed -i -e 's#\\#/#g' %T/SerializeTest/common.cpp_*.yaml
 // RUN: diff -b %T/SerializeTest/common_expected.yaml %T/SerializeTest/common.cpp_*.yaml
 //

Modified: clang-tools-extra/trunk/test/clang-modernize/HeaderReplacements/main_expected.yaml
URL: http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/test/clang-modernize/HeaderReplacements/main_expected.yaml?rev=196559&r1=196558&r2=196559&view=diff
==============================================================================
--- clang-tools-extra/trunk/test/clang-modernize/HeaderReplacements/main_expected.yaml (original)
+++ clang-tools-extra/trunk/test/clang-modernize/HeaderReplacements/main_expected.yaml Thu Dec  5 20:00:41 2013
@@ -1,11 +1,11 @@
 ---
-MainSourceFile:      $(path)/main.cpp
+MainSourceFile:      '$(path)/main.cpp'
 Replacements:
-  - FilePath:        $(path)/common.h
+  - FilePath:        '$(path)/common.h'
     Offset:          506
     Length:          2
     ReplacementText: elem
-  - FilePath:        $(path)/common.h
+  - FilePath:        '$(path)/common.h'
     Offset:          432
     Length:          61
     ReplacementText: '(auto & elem : C)'





More information about the cfe-commits mailing list