ArcsinX updated this revision to Diff 279781.
ArcsinX added a comment.
Get rid of `-i` `sed` option
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D83759/new/
https://reviews.llvm.org/D83759
Files:
clang-tools-extra/clangd/test/Inputs/background-index/compile_commands.json
clang-tools-extra/clangd/test/Inputs/background-index/compile_commands.json.tmpl
clang-tools-extra/clangd/test/Inputs/background-index/definition.jsonrpc
clang-tools-extra/clangd/test/Inputs/background-index/definition.jsonrpc.tmpl
clang-tools-extra/clangd/test/background-index.test
clang-tools-extra/clangd/test/did-change-configuration-params.test
clang-tools-extra/clangd/test/test-uri-windows.test
Index: clang-tools-extra/clangd/test/test-uri-windows.test
===================================================================
--- clang-tools-extra/clangd/test/test-uri-windows.test
+++ clang-tools-extra/clangd/test/test-uri-windows.test
@@ -1,5 +1,5 @@
# RUN: clangd -lit-test < %s | FileCheck -strict-whitespace %s
-# REQUIRES: windows-gnu || windows-msvc
+# UNSUPPORTED: !(windows-gnu || windows-msvc)
# Test authority-less URI
{"jsonrpc":"2.0","id":0,"method":"initialize","params":{"processId":123,"rootPath":"clangd","capabilities":{},"trace":"off"}}
---
Index: clang-tools-extra/clangd/test/did-change-configuration-params.test
===================================================================
--- clang-tools-extra/clangd/test/did-change-configuration-params.test
+++ clang-tools-extra/clangd/test/did-change-configuration-params.test
@@ -1,5 +1,5 @@
# RUN: clangd -compile_args_from=lsp -lit-test < %s 2> %t | FileCheck -strict-whitespace %s
-# RUN: cat %t | FileCheck --check-prefix=ERR %s
+# RUN: FileCheck --check-prefix=ERR --input-file=%t %s
# UNSUPPORTED: windows-gnu,windows-msvc
{"jsonrpc":"2.0","id":0,"method":"initialize","params":{"processId":123,"rootPath":"clangd","capabilities":{},"trace":"off"}}
---
Index: clang-tools-extra/clangd/test/background-index.test
===================================================================
--- clang-tools-extra/clangd/test/background-index.test
+++ clang-tools-extra/clangd/test/background-index.test
@@ -1,23 +1,23 @@
-# We need to splice paths into file:// URIs for this test.
-# UNSUPPORTED: windows-msvc
-
# Use a copy of inputs, as we'll mutate it (as will the background index).
-# RUN: rm -rf %t
-# RUN: cp -r %S/Inputs/background-index %t
+# RUN: rm -rf %/t
+# RUN: cp -r %/S/Inputs/background-index %/t
# Need to embed the correct temp path in the actual JSON-RPC requests.
-# RUN: sed -i -e "s|DIRECTORY|%t|" %t/definition.jsonrpc
-# RUN: sed -i -e "s|DIRECTORY|%t|" %t/compile_commands.json
+# RUN: sed -e "s|DIRECTORY|%/t|" %/t/definition.jsonrpc.tmpl > %/t/definition.jsonrpc.1
+# RUN: sed -e "s|DIRECTORY|%/t|" %/t/compile_commands.json.tmpl > %/t/compile_commands.json
+# On Windows, we need the URI in didOpen to look like "uri":"file:///C:/..."
+# (with the extra slash in the front), so we add it here.
+# RUN: sed -E -e 's|"file://([A-Z]):/|"file:///\1:/|g' %/t/definition.jsonrpc.1 > %/t/definition.jsonrpc
# We're editing bar.cpp, which includes foo.h.
# foo() is declared in foo.h and defined in foo.cpp.
# The background index should allow us to go-to-definition on foo().
# We should also see indexing progress notifications.
-# RUN: clangd -background-index -lit-test < %t/definition.jsonrpc | FileCheck %t/definition.jsonrpc --check-prefixes=CHECK,BUILD
+# RUN: clangd -background-index -lit-test < %/t/definition.jsonrpc | FileCheck %/t/definition.jsonrpc --check-prefixes=CHECK,BUILD
# Test that the index is writing files in the expected location.
-# RUN: ls %t/.cache/clangd/index/foo.cpp.*.idx
-# RUN: ls %t/sub_dir/.cache/clangd/index/foo.h.*.idx
+# RUN: ls %/t/.cache/clangd/index/foo.cpp.*.idx
+# RUN: ls %/t/sub_dir/.cache/clangd/index/foo.h.*.idx
# Test the index is read from disk: delete code and restart clangd.
-# RUN: rm %t/foo.cpp
-# RUN: clangd -background-index -lit-test < %t/definition.jsonrpc | FileCheck %t/definition.jsonrpc --check-prefixes=CHECK,USE
+# RUN: rm %/t/foo.cpp
+# RUN: clangd -background-index -lit-test < %/t/definition.jsonrpc | FileCheck %/t/definition.jsonrpc --check-prefixes=CHECK,USE
Index: clang-tools-extra/clangd/test/Inputs/background-index/definition.jsonrpc
===================================================================
--- /dev/null
+++ clang-tools-extra/clangd/test/Inputs/background-index/definition.jsonrpc
@@ -1,76 +0,0 @@
-{
- "jsonrpc": "2.0",
- "id": 0,
- "method": "initialize",
- "params": {
- "processId": 123,
- "rootPath": "clangd",
- "capabilities": { "window": { "workDoneProgress": true, "implicitWorkDoneProgressCreate": true} },
- "trace": "off"
- }
-}
----
-{
- "jsonrpc": "2.0",
- "method": "textDocument/didOpen",
- "params": {
- "textDocument": {
- "uri": "file://DIRECTORY/bar.cpp",
- "languageId": "cpp",
- "version": 1,
- "text": "#include \"sub_dir/foo.h\"\nint main(){\nreturn foo();\n}"
- }
- }
-}
-# BUILD: "method": "$/progress"
-# BUILD-NEXT: "params": {
-# BUILD-NEXT: "token": "backgroundIndexProgress",
-# BUILD-NEXT: "value": {
-# BUILD-NEXT: "kind": "begin",
-# BUILD-NEXT: "percentage": 0,
-# BUILD-NEXT: "title": "indexing"
-# BUILD-NEXT: }
-# BUILD-NEXT: }
-# BUILD: "method": "$/progress"
-# BUILD-NEXT: "params": {
-# BUILD-NEXT: "token": "backgroundIndexProgress",
-# BUILD-NEXT: "value": {
-# BUILD-NEXT: "kind": "report",
-# BUILD-NEXT: "message": "0/1",
-# BUILD-NEXT: "percentage": 0
-# BUILD-NEXT: }
-# BUILD-NEXT: }
-# later...
-# BUILD: "message": "1/2",
-# BUILD-NEXT: "percentage": 50
-# finally...
-# BUILD: "kind": "end"
-# when using the index, we spawn one task to read it, but not more.
-# USE-NOT: "message": "1/2",
----
-{
- "jsonrpc": "2.0",
- "id": 1,
- "method": "sync",
- "params": null
-}
----
-{
- "jsonrpc": "2.0",
- "id": 2,
- "method": "textDocument/definition",
- "params": {
- "textDocument": {
- "uri": "file://DIRECTORY/bar.cpp"
- },
- "position": {
- "line": 2,
- "character": 8
- }
- }
-}
-# CHECK: "uri": "file://{{.*}}/foo.cpp"
----
-{"jsonrpc":"2.0","id":3,"method":"shutdown"}
----
-{"jsonrpc":"2.0","method":"exit"}
Index: clang-tools-extra/clangd/test/Inputs/background-index/compile_commands.json
===================================================================
--- /dev/null
+++ clang-tools-extra/clangd/test/Inputs/background-index/compile_commands.json
@@ -1,5 +0,0 @@
-[{
- "directory": "DIRECTORY",
- "command": "clang foo.cpp",
- "file": "DIRECTORY/foo.cpp"
-}]
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
