Author: ioeric Date: Wed Feb 28 12:31:00 2018 New Revision: 326365 URL: http://llvm.org/viewvc/llvm-project?rev=326365&view=rev Log: [clangd] Try to fix failures on clang-x64-ninja-win7 build bot.
Modified: clang-tools-extra/trunk/test/clangd/crash-non-added-files.test clang-tools-extra/trunk/test/clangd/hover.test clang-tools-extra/trunk/test/clangd/initialize-params-invalid.test clang-tools-extra/trunk/test/clangd/initialize-params.test clang-tools-extra/trunk/test/clangd/insert-include.test Modified: clang-tools-extra/trunk/test/clangd/crash-non-added-files.test URL: http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/test/clangd/crash-non-added-files.test?rev=326365&r1=326364&r2=326365&view=diff ============================================================================== --- clang-tools-extra/trunk/test/clangd/crash-non-added-files.test (original) +++ clang-tools-extra/trunk/test/clangd/crash-non-added-files.test Wed Feb 28 12:31:00 2018 @@ -1,28 +1,28 @@ # RUN: clangd -lit-test < %s | FileCheck -strict-whitespace %s {"jsonrpc":"2.0","id":0,"method":"initialize","params":{"processId":123,"rootPath":"clangd","capabilities":{},"trace":"off"}} --- -{"jsonrpc":"2.0","id":2,"method":"textDocument/codeAction","params":{"textDocument":{"uri":"file:///foo.c"},"range":{"start":{"line":104,"character":13},"end":{"line":0,"character":35}},"context":{"diagnostics":[{"range":{"start": {"line": 0, "character": 32}, "end": {"line": 0, "character": 37}},"severity":2,"message":"using the result of an assignment as a condition without parentheses"},{"range":{"start": {"line": 0, "character": 34}, "end": {"line": 0, "character": 35}},"severity":3,"message":"place parentheses around the assignment to silence this warning"},{"range":{"start": {"line": 0, "character": 34}, "end": {"line": 0, "character": 35}},"severity":3,"message":"use '==' to turn this assignment into an equality comparison"}]}}} +{"jsonrpc":"2.0","id":2,"method":"textDocument/codeAction","params":{"textDocument":{"uri":"test:///foo.c"},"range":{"start":{"line":104,"character":13},"end":{"line":0,"character":35}},"context":{"diagnostics":[{"range":{"start": {"line": 0, "character": 32}, "end": {"line": 0, "character": 37}},"severity":2,"message":"using the result of an assignment as a condition without parentheses"},{"range":{"start": {"line": 0, "character": 34}, "end": {"line": 0, "character": 35}},"severity":3,"message":"place parentheses around the assignment to silence this warning"},{"range":{"start": {"line": 0, "character": 34}, "end": {"line": 0, "character": 35}},"severity":3,"message":"use '==' to turn this assignment into an equality comparison"}]}}} # CHECK: "error": { # CHECK-NEXT: "code": -32602 # CHECK-NEXT: "message": "onCodeAction called for non-added file" # CHECK-NEXT: }, # CHECK-NEXT: "id": 2, --- -{"jsonrpc":"2.0","id":3,"method":"textDocument/rangeFormatting","params":{"textDocument":{"uri":"file:///foo.c"},"range":{"start":{"line":1,"character":4},"end":{"line":1,"character":12}},"options":{"tabSize":4,"insertSpaces":true}}} +{"jsonrpc":"2.0","id":3,"method":"textDocument/rangeFormatting","params":{"textDocument":{"uri":"test:///foo.c"},"range":{"start":{"line":1,"character":4},"end":{"line":1,"character":12}},"options":{"tabSize":4,"insertSpaces":true}}} # CHECK: "error": { # CHECK-NEXT: "code": -32602 # CHECK-NEXT: "message": "onDocumentRangeFormatting called for non-added file" # CHECK-NEXT: }, # CHECK-NEXT: "id": 3, --- -{"jsonrpc":"2.0","id":4,"method":"textDocument/formatting","params":{"textDocument":{"uri":"file:///foo.c"},"options":{"tabSize":4,"insertSpaces":true}}} +{"jsonrpc":"2.0","id":4,"method":"textDocument/formatting","params":{"textDocument":{"uri":"test:///foo.c"},"options":{"tabSize":4,"insertSpaces":true}}} # CHECK: "error": { # CHECK-NEXT: "code": -32602 # CHECK-NEXT: "message": "onDocumentFormatting called for non-added file" # CHECK-NEXT: }, # CHECK-NEXT: "id": 4, --- -{"jsonrpc":"2.0","id":5,"method":"textDocument/onTypeFormatting","params":{"textDocument":{"uri":"file:///foo.c"},"position":{"line":3,"character":1},"ch":"}","options":{"tabSize":4,"insertSpaces":true}}} +{"jsonrpc":"2.0","id":5,"method":"textDocument/onTypeFormatting","params":{"textDocument":{"uri":"test:///foo.c"},"position":{"line":3,"character":1},"ch":"}","options":{"tabSize":4,"insertSpaces":true}}} # CHECK: "error": { # CHECK-NEXT: "code": -32602 # CHECK-NEXT: "message": "onDocumentOnTypeFormatting called for non-added file" Modified: clang-tools-extra/trunk/test/clangd/hover.test URL: http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/test/clangd/hover.test?rev=326365&r1=326364&r2=326365&view=diff ============================================================================== --- clang-tools-extra/trunk/test/clangd/hover.test (original) +++ clang-tools-extra/trunk/test/clangd/hover.test Wed Feb 28 12:31:00 2018 @@ -1,9 +1,9 @@ # RUN: clangd -lit-test < %s | FileCheck %s {"jsonrpc":"2.0","id":0,"method":"initialize","params":{"processId":123,"rootPath":"clangd","capabilities":{},"trace":"off"}} --- -{"jsonrpc":"2.0","method":"textDocument/didOpen","params":{"textDocument":{"uri":"file:///main.cpp","languageId":"cpp","version":1,"text":"void foo(); int main() { foo(); }\n"}}} +{"jsonrpc":"2.0","method":"textDocument/didOpen","params":{"textDocument":{"uri":"test:///main.cpp","languageId":"cpp","version":1,"text":"void foo(); int main() { foo(); }\n"}}} --- -{"jsonrpc":"2.0","id":1,"method":"textDocument/hover","params":{"textDocument":{"uri":"file:///main.cpp"},"position":{"line":0,"character":27}}} +{"jsonrpc":"2.0","id":1,"method":"textDocument/hover","params":{"textDocument":{"uri":"test:///main.cpp"},"position":{"line":0,"character":27}}} # CHECK: "id": 1, # CHECK-NEXT: "jsonrpc": "2.0", # CHECK-NEXT: "result": { Modified: clang-tools-extra/trunk/test/clangd/initialize-params-invalid.test URL: http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/test/clangd/initialize-params-invalid.test?rev=326365&r1=326364&r2=326365&view=diff ============================================================================== --- clang-tools-extra/trunk/test/clangd/initialize-params-invalid.test (original) +++ clang-tools-extra/trunk/test/clangd/initialize-params-invalid.test Wed Feb 28 12:31:00 2018 @@ -1,6 +1,6 @@ # RUN: clangd -lit-test < %s | FileCheck -strict-whitespace %s # Test with invalid initialize request parameters -{"jsonrpc":"2.0","id":0,"method":"initialize","params":{"processId":"","rootUri":"file:///path/to/workspace","capabilities":{},"trace":"off"}} +{"jsonrpc":"2.0","id":0,"method":"initialize","params":{"processId":"","rootUri":"test:///workspace","capabilities":{},"trace":"off"}} # CHECK: "id": 0, # CHECK-NEXT: "jsonrpc": "2.0", # CHECK-NEXT: "result": { Modified: clang-tools-extra/trunk/test/clangd/initialize-params.test URL: http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/test/clangd/initialize-params.test?rev=326365&r1=326364&r2=326365&view=diff ============================================================================== --- clang-tools-extra/trunk/test/clangd/initialize-params.test (original) +++ clang-tools-extra/trunk/test/clangd/initialize-params.test Wed Feb 28 12:31:00 2018 @@ -1,6 +1,6 @@ # RUN: clangd -lit-test < %s | FileCheck -strict-whitespace %s # Test initialize request parameters with rootUri -{"jsonrpc":"2.0","id":0,"method":"initialize","params":{"processId":123,"rootUri":"file:///path/to/workspace","capabilities":{},"trace":"off"}} +{"jsonrpc":"2.0","id":0,"method":"initialize","params":{"processId":123,"rootUri":"test:///workspace","capabilities":{},"trace":"off"}} # CHECK: "id": 0, # CHECK-NEXT: "jsonrpc": "2.0", # CHECK-NEXT: "result": { Modified: clang-tools-extra/trunk/test/clangd/insert-include.test URL: http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/test/clangd/insert-include.test?rev=326365&r1=326364&r2=326365&view=diff ============================================================================== --- clang-tools-extra/trunk/test/clangd/insert-include.test (original) +++ clang-tools-extra/trunk/test/clangd/insert-include.test Wed Feb 28 12:31:00 2018 @@ -13,7 +13,7 @@ # CHECK-NEXT: "params": { # CHECK-NEXT: "edit": { # CHECK-NEXT: "changes": { -# CHECK-NEXT: "file:///clangd-test/main.cpp": [ +# CHECK-NEXT: "file://{{.*}}/main.cpp": [ # CHECK-NEXT: { # CHECK-NEXT: "newText": "#include <vector>\n", # CHECK-NEXT: "range": { _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits