Author: Aleksandr Platonov Date: 2020-07-22T16:00:34+03:00 New Revision: 98b56c09be002855df18dada7debdb1322aad7d9
URL: https://github.com/llvm/llvm-project/commit/98b56c09be002855df18dada7debdb1322aad7d9 DIFF: https://github.com/llvm/llvm-project/commit/98b56c09be002855df18dada7debdb1322aad7d9.diff LOG: [clangd] Fixes in lit tests Summary: Changes: - `background-index.test` Add Windows support, don't create redundant `*-e` files on macOS - `did-change-configuration-params.test` Replace `cat | FileCheck` with `FileCheck --input-file` - `test-uri-windows.test` This test did not run on Windows displite `REQUIRES: windows-gnu || windows-msvc` (replacement: `UNSUPPORTED: !(windows-gnu || windows-msvc)`). Reviewers: sammccall, kadircet Reviewed By: kadircet Subscribers: thakis, njames93, ormris, ilya-biryukov, MaskRay, jkorous, arphaman, kadircet, usaxena95, cfe-commits Tags: #clang Differential Revision: https://reviews.llvm.org/D83759 Added: clang-tools-extra/clangd/test/Inputs/background-index/compile_commands.json.tmpl clang-tools-extra/clangd/test/Inputs/background-index/definition.jsonrpc.tmpl Modified: 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 Removed: clang-tools-extra/clangd/test/Inputs/background-index/compile_commands.json clang-tools-extra/clangd/test/Inputs/background-index/definition.jsonrpc ################################################################################ diff --git a/clang-tools-extra/clangd/test/Inputs/background-index/compile_commands.json b/clang-tools-extra/clangd/test/Inputs/background-index/compile_commands.json.tmpl similarity index 100% rename from clang-tools-extra/clangd/test/Inputs/background-index/compile_commands.json rename to clang-tools-extra/clangd/test/Inputs/background-index/compile_commands.json.tmpl diff --git a/clang-tools-extra/clangd/test/Inputs/background-index/definition.jsonrpc b/clang-tools-extra/clangd/test/Inputs/background-index/definition.jsonrpc.tmpl similarity index 100% rename from clang-tools-extra/clangd/test/Inputs/background-index/definition.jsonrpc rename to clang-tools-extra/clangd/test/Inputs/background-index/definition.jsonrpc.tmpl diff --git a/clang-tools-extra/clangd/test/background-index.test b/clang-tools-extra/clangd/test/background-index.test index 41184443e947..1983f0957dcc 100644 --- a/clang-tools-extra/clangd/test/background-index.test +++ b/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 diff --git a/clang-tools-extra/clangd/test/did-change-configuration-params.test b/clang-tools-extra/clangd/test/did-change-configuration-params.test index 4aef1011b370..19d41d0812e2 100644 --- a/clang-tools-extra/clangd/test/did-change-configuration-params.test +++ b/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"}} --- diff --git a/clang-tools-extra/clangd/test/test-uri-windows.test b/clang-tools-extra/clangd/test/test-uri-windows.test index 381c48fafc03..3f03b2985a70 100644 --- a/clang-tools-extra/clangd/test/test-uri-windows.test +++ b/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"}} --- _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
