[clang-tools-extra] r347466 - [clangd] Cleanup: use index file instead of header in workspace symbols lit test.

[Eric Liu via cfe-commits]

Author: ioeric
Date: Thu Nov 22 06:59:22 2018
New Revision: 347466

URL: http://llvm.org/viewvc/llvm-project?rev=347466&view=rev
Log:
[clangd] Cleanup: use index file instead of header in workspace symbols lit test.

Summary:
The full path of the input header depends on the execution environment
and may result in different behavior (e.g. when different URI schemes are used).

Reviewers: sammccall

Subscribers: ilya-biryukov, MaskRay, jkorous, arphaman, kadircet, cfe-commits

Differential Revision: https://reviews.llvm.org/D54833

Added:
    clang-tools-extra/trunk/test/clangd/Inputs/symbols.test.yaml
Removed:
    clang-tools-extra/trunk/test/clangd/Inputs/sstream.h
Modified:
    clang-tools-extra/trunk/test/clangd/symbols.test

Removed: clang-tools-extra/trunk/test/clangd/Inputs/sstream.h
URL: http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/test/clangd/Inputs/sstream.h?rev=347465&view=auto
==============================================================================
--- clang-tools-extra/trunk/test/clangd/Inputs/sstream.h (original)
+++ clang-tools-extra/trunk/test/clangd/Inputs/sstream.h (removed)
@@ -1,3 +0,0 @@
-namespace std {
-class basic_ostringstream {};
-}

Added: clang-tools-extra/trunk/test/clangd/Inputs/symbols.test.yaml
URL: http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/test/clangd/Inputs/symbols.test.yaml?rev=347466&view=auto
==============================================================================
--- clang-tools-extra/trunk/test/clangd/Inputs/symbols.test.yaml (added)
+++ clang-tools-extra/trunk/test/clangd/Inputs/symbols.test.yaml Thu Nov 22 06:59:22 2018
@@ -0,0 +1,17 @@
+---
+!Symbol
+ID:              057557CEBF6E6B2D
+Name:            'vector'
+Scope:           'std::'
+SymInfo:         
+  Kind:            Class
+  Lang:            Cpp
+CanonicalDeclaration: 
+  FileURI:         'file:///vector.h'
+  Start:           
+    Line:            215
+    Column:          10
+  End:             
+    Line:            215
+    Column:          16
+...

Modified: clang-tools-extra/trunk/test/clangd/symbols.test
URL: http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/test/clangd/symbols.test?rev=347466&r1=347465&r2=347466&view=diff
==============================================================================
--- clang-tools-extra/trunk/test/clangd/symbols.test (original)
+++ clang-tools-extra/trunk/test/clangd/symbols.test Thu Nov 22 06:59:22 2018
@@ -1,9 +1,9 @@
-# RUN: env CPATH=%S/Inputs clangd -lit-test < %s | FileCheck %s
+# RUN: clangd --index-file=%S/Inputs/symbols.test.yaml -lit-test < %s | FileCheck %s
 {"jsonrpc":"2.0","id":0,"method":"initialize","params":{"processId":123,"rootPath":"clangd","capabilities":{"workspace":{"symbol":{"symbolKind":{"valueSet": [1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26]}}}},"trace":"off"}}
 ---
-{"jsonrpc":"2.0","method":"textDocument/didOpen","params":{"textDocument":{"uri":"test:///main.cpp","languageId":"cpp","version":1,"text":"#include <sstream.h>\nvoid 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":"workspace/symbol","params":{"query":"std::basic_ostringstream"}}
+{"jsonrpc":"2.0","id":1,"method":"workspace/symbol","params":{"query":"vector"}}
 #      CHECK:  "id": 1,
 # CHECK-NEXT:  "jsonrpc": "2.0",
 # CHECK-NEXT:    "result": [
@@ -21,9 +21,9 @@
 # CHECK-NEXT:              "line": {{.*}}
 # CHECK-NEXT:            }
 # CHECK-NEXT:          },
-# CHECK-NEXT:          "uri": "file://{{.*}}/sstream.h"
+# CHECK-NEXT:          "uri": "file:///vector.h"
 # CHECK-NEXT:        },
-# CHECK-NEXT:        "name": "basic_ostringstream"
+# CHECK-NEXT:        "name": "vector"
 # CHECK-NEXT:      }
 # CHECK-NEXT:    ]
 # CHECK-NEXT:}