Fix clang-format-test.el past 625841c #106398
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Member
|
@llvm/pr-subscribers-clang-format Author: Danial Klimkin (dklimkin) ChangesFull diff: https://github.com/llvm/llvm-project/pull/106398.diff 1 Files Affected:
diff --git a/clang/tools/clang-format/clang-format-test.el b/clang/tools/clang-format/clang-format-test.el
index 41df1a9ca68af4..667d606b4f238d 100644
--- a/clang/tools/clang-format/clang-format-test.el
+++ b/clang/tools/clang-format/clang-format-test.el
@@ -58,16 +58,16 @@
(should-not delete)
(should-not display)
(should (equal args
- '("-output-replacements-xml" "-assume-filename" "foo.cpp"
- "-fallback-style" "none"
+ '("--output-replacements-xml" "--assume-filename" "foo.cpp"
+ "--fallback-style" "none"
;; Beginning of buffer, no byte-order mark.
- "-offset" "0"
+ "--offset" "0"
;; We have two lines with 2×2 bytes for the umlauts,
;; 1 byte for the line ending, and 3 bytes for the
;; other ASCII characters each.
- "-length" "16"
+ "--length" "16"
;; Length of a single line (without line ending).
- "-cursor" "7")))))))
+ "--cursor" "7")))))))
(ert-deftest clang-format-buffer--process-encoding ()
"Tests that text is sent to the clang-format process in the
|
Contributor
|
@dklimkin I known this is a trivial fix, but it would be better to request anyone from https://github.com/orgs/llvm/teams/pr-subscribers-clang-format to have a look before merging it. There was an outstanding PR #106305 before yours. Can you review it and see if you want to ask the author to close it? |
Member
Author
|
Race condition! Will update the other PR. |
Contributor
@dklimkin can you link to "the other PR"? Should we revert this one now? |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.