diff options
3 files changed, 10 insertions, 10 deletions
diff --git a/clang-tools-extra/test/clang-modernize/HeaderReplacements/common_expected.yaml b/clang-tools-extra/test/clang-modernize/HeaderReplacements/common_expected.yaml index fbacb47b429..08ff5aeb93a 100644 --- a/clang-tools-extra/test/clang-modernize/HeaderReplacements/common_expected.yaml +++ b/clang-tools-extra/test/clang-modernize/HeaderReplacements/common_expected.yaml @@ -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)' diff --git a/clang-tools-extra/test/clang-modernize/HeaderReplacements/main.cpp b/clang-tools-extra/test/clang-modernize/HeaderReplacements/main.cpp index c25dba7268a..c0f594421b4 100644 --- a/clang-tools-extra/test/clang-modernize/HeaderReplacements/main.cpp +++ b/clang-tools-extra/test/clang-modernize/HeaderReplacements/main.cpp @@ -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 // diff --git a/clang-tools-extra/test/clang-modernize/HeaderReplacements/main_expected.yaml b/clang-tools-extra/test/clang-modernize/HeaderReplacements/main_expected.yaml index 0ca29cb3edf..48c919a8113 100644 --- a/clang-tools-extra/test/clang-modernize/HeaderReplacements/main_expected.yaml +++ b/clang-tools-extra/test/clang-modernize/HeaderReplacements/main_expected.yaml @@ -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)' |
