diff options
| author | Matthew Voss <matthew.voss@sony.com> | 2018-11-28 18:48:32 +0000 |
|---|---|---|
| committer | Matthew Voss <matthew.voss@sony.com> | 2018-11-28 18:48:32 +0000 |
| commit | 2c8a0543107b23d3032b63e010dd4665f251d14f (patch) | |
| tree | a4bec857e21e4e4887dddb2dff6656248dba5c5f /clang-tools-extra/test | |
| parent | 5c0d1925e333442b9138e88c4eff3b0a915d6702 (diff) | |
| download | bcm5719-llvm-2c8a0543107b23d3032b63e010dd4665f251d14f.tar.gz bcm5719-llvm-2c8a0543107b23d3032b63e010dd4665f251d14f.zip | |
Revert "[clang-tools-extra] r347753 - [clangd] Build and test IndexBenchmark in check-clangd"
This revision was causing failures on the buildbots, and our internal CI.
See: http://lab.llvm.org:8011/builders/clang-s390x-linux/builds/20856
llvm-svn: 347792
Diffstat (limited to 'clang-tools-extra/test')
| -rw-r--r-- | clang-tools-extra/test/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | clang-tools-extra/test/clangd/Inputs/requests.json | 14 | ||||
| -rw-r--r-- | clang-tools-extra/test/clangd/index-tools.test | 1 |
3 files changed, 8 insertions, 11 deletions
diff --git a/clang-tools-extra/test/CMakeLists.txt b/clang-tools-extra/test/CMakeLists.txt index 12442455f7a..451c181fdf0 100644 --- a/clang-tools-extra/test/CMakeLists.txt +++ b/clang-tools-extra/test/CMakeLists.txt @@ -72,10 +72,6 @@ set(CLANGD_TEST_DEPS dexp ) -if (LLVM_INCLUDE_BENCHMARKS) - list(APPEND CLANGD_TEST_DEPS IndexBenchmark) -endif() - # Add lit test dependencies. set(LLVM_UTILS_DEPS FileCheck count not diff --git a/clang-tools-extra/test/clangd/Inputs/requests.json b/clang-tools-extra/test/clangd/Inputs/requests.json index ee91cf24374..3ddb9cb700e 100644 --- a/clang-tools-extra/test/clangd/Inputs/requests.json +++ b/clang-tools-extra/test/clangd/Inputs/requests.json @@ -1,7 +1,7 @@ -[{"Limit":100,"ProximityPaths":["/usr/home/user/clang-tools-extra/clangd/benchmarks/IndexBenchmark.cpp"],"Query":"OMP","RestrictForCodeCompletion":true,"Scopes":["clang::"], "AnyScope":false}, -{"Limit":100,"ProximityPaths":[],"Query":"s","RestrictForCodeCompletion":true,"Scopes":["llvm::", ""], "AnyScope":false}, -{"Limit":100,"ProximityPaths":[],"Query":"sy","RestrictForCodeCompletion":true,"Scopes":["llvm::", ""], "AnyScope":false}, -{"Limit":100,"ProximityPaths":[],"Query":"sys","RestrictForCodeCompletion":true,"Scopes":["llvm::", ""], "AnyScope":false}, -{"Limit":100,"ProximityPaths":[],"Query":"sys","RestrictForCodeCompletion":true,"Scopes":["llvm::", ""], "AnyScope":false}, -{"Limit":100,"ProximityPaths":[],"Query":"Dex","RestrictForCodeCompletion":true,"Scopes":["clang::clangd::", "clang::", "clang::clangd::dex::"],"AnyScope":false}, -{"Limit":100,"ProximityPaths":[],"Query":"Variable","RestrictForCodeCompletion":true,"Scopes":[""], "AnyScope":false}] +[{"Limit":100,"ProximityPaths":["/usr/home/user/clang-tools-extra/clangd/benchmarks/IndexBenchmark.cpp"],"Query":"OMP","RestrictForCodeCompletion":true,"Scopes":["clang::"]}, +{"Limit":100,"ProximityPaths":[],"Query":"s","RestrictForCodeCompletion":true,"Scopes":["llvm::", ""]}, +{"Limit":100,"ProximityPaths":[],"Query":"sy","RestrictForCodeCompletion":true,"Scopes":["llvm::", ""]}, +{"Limit":100,"ProximityPaths":[],"Query":"sys","RestrictForCodeCompletion":true,"Scopes":["llvm::", ""]}, +{"Limit":100,"ProximityPaths":[],"Query":"sys","RestrictForCodeCompletion":true,"Scopes":["llvm::", ""]}, +{"Limit":100,"ProximityPaths":[],"Query":"Dex","RestrictForCodeCompletion":true,"Scopes":["clang::clangd::", "clang::", "clang::clangd::dex::"]}, +{"Limit":100,"ProximityPaths":[],"Query":"Variable","RestrictForCodeCompletion":true,"Scopes":[""]}] diff --git a/clang-tools-extra/test/clangd/index-tools.test b/clang-tools-extra/test/clangd/index-tools.test index ff6e6748c1f..93cf56fea37 100644 --- a/clang-tools-extra/test/clangd/index-tools.test +++ b/clang-tools-extra/test/clangd/index-tools.test @@ -1,4 +1,5 @@ # RUN: clangd-indexer %p/Inputs/BenchmarkSource.cpp -- -I%p/Inputs > %t.index +# FIXME: By default, benchmarks are excluded from the list of default targets hence not built. Find a way to depend on benchmarks to run the next command. # REQUIRES: shell # RUN: if [ -f %clangd-benchmark-dir/IndexBenchmark ]; then %clangd-benchmark-dir/IndexBenchmark %t.index %p/Inputs/requests.json --benchmark_min_time=0.01 ; fi # Pass invalid JSON file and check that IndexBenchmark fails to parse it. |
