This is an archive of the discontinued LLVM Phabricator instance.

Differential D50255

Add test for changing build configuration
ClosedPublic

Authored by simark on Aug 3 2018, 7:42 AM.

Details

Reviewers
arphaman
Commits
rG70e209b8163c: [clangd] Add test for changing build configuration
rCTE338914: [clangd] Add test for changing build configuration
rL338914: [clangd] Add test for changing build configuration
Summary

This patch adds tests for the two ways of changing build configuration
(pointing to a particular compile_commands.json):

  • Through the workspace/didChangeConfiguration notification.
  • Through the initialize request.

Diff Detail

Event Timeline

simark created this revision.Aug 3 2018, 7:42 AM
Herald added subscribers: cfe-commits, arphaman, jkorous and 2 others. · View Herald TranscriptAug 3 2018, 7:42 AM
Harbormaster completed remote builds in B21041: Diff 159010.Aug 3 2018, 7:42 AM
simark added a reviewer: arphaman.Aug 3 2018, 7:43 AM

This was not tested on windows yet.

simark updated this revision to Diff 159050.Aug 3 2018, 10:59 AM

The tests now work on Windows, I added some path adjustment steps.

arphaman accepted this revision.Aug 3 2018, 12:36 PM

Thanks! This LGTM.

This revision is now accepted and ready to land.Aug 3 2018, 12:36 PM
Closed by commit rL338914: [clangd] Add test for changing build configuration (authored by simark). · Explain WhyAug 3 2018, 12:40 PM
This revision was automatically updated to reflect the committed changes.
Herald added a subscriber: llvm-commits. · View Herald TranscriptAug 3 2018, 12:40 PM
simark added a comment.Aug 3 2018, 12:40 PM
In D50255#1187871, @arphaman wrote:

Thanks! This LGTM.

Well, thanks for the hints!

Revision Contents

Diff 159010

test/clangd/compile-commands-path-in-initialize.test

  • This file was added.
# Test that we can set choose a configuration/build directly in the initialize
# request.
# RUN: rm -rf %t.dir/* && mkdir -p %t.dir
# RUN: mkdir %t.dir/build-1
# RUN: mkdir %t.dir/build-2
# RUN: echo '[{"directory": "%t.dir", "command": "c++ the-file.cpp", "file": "the-file.cpp"}]' > %t.dir/compile_commands.json
# RUN: echo '[{"directory": "%t.dir/build-1", "command": "c++ -DMACRO=1 the-file.cpp", "file": "../the-file.cpp"}]' > %t.dir/build-1/compile_commands.json
# RUN: echo '[{"directory": "%t.dir/build-2", "command": "c++ -DMACRO=2 the-file.cpp", "file": "../the-file.cpp"}]' > %t.dir/build-2/compile_commands.json
# RUN: sed -e "s|INPUT_DIR|%t.dir|g" %s > %t.test
# RUN: clangd -lit-test < %t.test | FileCheck -strict-whitespace %t.test
{"jsonrpc":"2.0","id":0,"method":"initialize","params":{"initializationOptions":{"compilationDatabasePath":"INPUT_DIR/build-1"}}}
---
{"jsonrpc":"2.0","method":"textDocument/didOpen","params":{"textDocument":{"uri":"file://INPUT_DIR/the-file.cpp","languageId":"cpp","version":1,"text":"#if !defined(MACRO)\n#pragma message (\"MACRO is not defined\")\n#elif MACRO == 1\n#pragma message (\"MACRO is one\")\n#elif MACRO == 2\n#pragma message (\"MACRO is two\")\n#else\n#pragma message (\"woops\")\n#endif\nint main() {}\n"}}}
# CHECK: "method": "textDocument/publishDiagnostics",
# CHECK-NEXT: "params": {
# CHECK-NEXT: "diagnostics": [
# CHECK-NEXT: {
# CHECK-NEXT: "message": "MACRO is one",
---
{"jsonrpc":"2.0","id":0,"method":"workspace/didChangeConfiguration","params":{"settings":{"compilationDatabasePath":"INPUT_DIR/build-2"}}}
# CHECK: "method": "textDocument/publishDiagnostics",
# CHECK-NEXT: "params": {
# CHECK-NEXT: "diagnostics": [
# CHECK-NEXT: {
# CHECK-NEXT: "message": "MACRO is two",
---
{"jsonrpc":"2.0","id":10000,"method":"shutdown"}

test/clangd/compile-commands-path.test

  • This file was added.
# Test that we can switch between configuration/build using the
# workspace/didChangeConfiguration notification.
# RUN: rm -rf %t.dir/* && mkdir -p %t.dir
# RUN: mkdir %t.dir/build-1
# RUN: mkdir %t.dir/build-2
# RUN: echo '[{"directory": "%t.dir", "command": "c++ the-file.cpp", "file": "the-file.cpp"}]' > %t.dir/compile_commands.json
# RUN: echo '[{"directory": "%t.dir/build-1", "command": "c++ -DMACRO=1 the-file.cpp", "file": "../the-file.cpp"}]' > %t.dir/build-1/compile_commands.json
# RUN: echo '[{"directory": "%t.dir/build-2", "command": "c++ -DMACRO=2 the-file.cpp", "file": "../the-file.cpp"}]' > %t.dir/build-2/compile_commands.json
# RUN: sed -e "s|INPUT_DIR|%t.dir|g" %s > %t.test
# RUN: clangd -lit-test < %t.test | FileCheck -strict-whitespace %t.test
{"jsonrpc":"2.0","id":0,"method":"initialize","params":{}}
---
{"jsonrpc":"2.0","method":"textDocument/didOpen","params":{"textDocument":{"uri":"file://INPUT_DIR/the-file.cpp","languageId":"cpp","version":1,"text":"#if !defined(MACRO)\n#pragma message (\"MACRO is not defined\")\n#elif MACRO == 1\n#pragma message (\"MACRO is one\")\n#elif MACRO == 2\n#pragma message (\"MACRO is two\")\n#else\n#pragma message (\"woops\")\n#endif\nint main() {}\n"}}}
# CHECK: "method": "textDocument/publishDiagnostics",
# CHECK-NEXT: "params": {
# CHECK-NEXT: "diagnostics": [
# CHECK-NEXT: {
# CHECK-NEXT: "message": "MACRO is not defined",
---
{"jsonrpc":"2.0","id":0,"method":"workspace/didChangeConfiguration","params":{"settings":{"compilationDatabasePath":"INPUT_DIR/build-1"}}}
# CHECK: "method": "textDocument/publishDiagnostics",
# CHECK-NEXT: "params": {
# CHECK-NEXT: "diagnostics": [
# CHECK-NEXT: {
# CHECK-NEXT: "message": "MACRO is one",
---
{"jsonrpc":"2.0","id":0,"method":"workspace/didChangeConfiguration","params":{"settings":{"compilationDatabasePath":"INPUT_DIR/build-2"}}}
# CHECK: "method": "textDocument/publishDiagnostics",
# CHECK-NEXT: "params": {
# CHECK-NEXT: "diagnostics": [
# CHECK-NEXT: {
# CHECK-NEXT: "message": "MACRO is two",
---
{"jsonrpc":"2.0","id":10000,"method":"shutdown"}