diff options
| author | Nikola Smiljanic <popizdeh@gmail.com> | 2014-12-09 02:57:56 +0000 |
|---|---|---|
| committer | Nikola Smiljanic <popizdeh@gmail.com> | 2014-12-09 02:57:56 +0000 |
| commit | 76c21b5a27643f8534fcf1139461f501a9fba6fd (patch) | |
| tree | 399b736f352b35f2642681e1e9f945f16007f2fa /clang-tools-extra | |
| parent | 53c038a58127e337ba3c8332eb5a87880602c7d2 (diff) | |
| download | bcm5719-llvm-76c21b5a27643f8534fcf1139461f501a9fba6fd.tar.gz bcm5719-llvm-76c21b5a27643f8534fcf1139461f501a9fba6fd.zip | |
Handle newlines on Windows correctly.
llvm-svn: 223750
Diffstat (limited to 'clang-tools-extra')
5 files changed, 26 insertions, 1 deletions
diff --git a/clang-tools-extra/clang-apply-replacements/tool/ClangApplyReplacementsMain.cpp b/clang-tools-extra/clang-apply-replacements/tool/ClangApplyReplacementsMain.cpp index fcd1a5519b7..607b665f05c 100644 --- a/clang-tools-extra/clang-apply-replacements/tool/ClangApplyReplacementsMain.cpp +++ b/clang-tools-extra/clang-apply-replacements/tool/ClangApplyReplacementsMain.cpp @@ -270,7 +270,7 @@ int main(int argc, char **argv) { // Write new file to disk std::error_code EC; - llvm::raw_fd_ostream FileStream(FileName, EC, llvm::sys::fs::F_Text); + llvm::raw_fd_ostream FileStream(FileName, EC, llvm::sys::fs::F_None); if (EC) { llvm::errs() << "Could not open " << FileName << " for writing\n"; continue; diff --git a/clang-tools-extra/test/clang-apply-replacements/Inputs/crlf/crlf.cpp b/clang-tools-extra/test/clang-apply-replacements/Inputs/crlf/crlf.cpp new file mode 100644 index 00000000000..26f79968f55 --- /dev/null +++ b/clang-tools-extra/test/clang-apply-replacements/Inputs/crlf/crlf.cpp @@ -0,0 +1,6 @@ +
+// This file intentionally uses a CRLF newlines!
+
+void foo() {
+ int *x = 0;
+}
diff --git a/clang-tools-extra/test/clang-apply-replacements/Inputs/crlf/crlf.cpp.expected b/clang-tools-extra/test/clang-apply-replacements/Inputs/crlf/crlf.cpp.expected new file mode 100644 index 00000000000..ad8e9078562 --- /dev/null +++ b/clang-tools-extra/test/clang-apply-replacements/Inputs/crlf/crlf.cpp.expected @@ -0,0 +1,6 @@ +
+// This file intentionally uses a CRLF newlines!
+
+void foo() {
+ int *x = nullptr;
+}
diff --git a/clang-tools-extra/test/clang-apply-replacements/Inputs/crlf/file1.yaml b/clang-tools-extra/test/clang-apply-replacements/Inputs/crlf/file1.yaml new file mode 100644 index 00000000000..0ee548ad5d4 --- /dev/null +++ b/clang-tools-extra/test/clang-apply-replacements/Inputs/crlf/file1.yaml @@ -0,0 +1,8 @@ +--- +MainSourceFile: source1.cpp +Replacements: + - FilePath: $(path)/crlf.cpp + Offset: 79 + Length: 1 + ReplacementText: nullptr +... diff --git a/clang-tools-extra/test/clang-apply-replacements/crlf.cpp b/clang-tools-extra/test/clang-apply-replacements/crlf.cpp new file mode 100644 index 00000000000..8a8fd46ddde --- /dev/null +++ b/clang-tools-extra/test/clang-apply-replacements/crlf.cpp @@ -0,0 +1,5 @@ +// RUN: mkdir -p %T/Inputs/crlf +// RUN: cp %S/Inputs/crlf/crlf.cpp %T/Inputs/crlf/crlf.cpp +// RUN: sed "s#\$(path)#%/T/Inputs/crlf#" %S/Inputs/crlf/file1.yaml > %T/Inputs/crlf/file1.yaml +// RUN: clang-apply-replacements %T/Inputs/crlf +// RUN: diff %T/Inputs/crlf/crlf.cpp %S/Inputs/crlf/crlf.cpp.expected |
