<div dir="ltr"><div dir="ltr">Hiya Haojian,<div><br></div><div>I've been looking over the build bots recently and believe r347753 may have caused the following test:</div><div><br></div><div>clangd/index-tools.test</div><div><br></div><div>to start failing. You can see the failing test in the logs of the following build bot:</div><div><br></div><div><a href="http://lab.llvm.org:8011/builders/clang-s390x-linux/builds/20851/steps/ninja%20check%201/logs/stdio">http://lab.llvm.org:8011/builders/clang-s390x-linux/builds/20851/steps/ninja%20check%201/logs/stdio</a><br></div><div><br></div><div>is there any chance you can take a look?</div><div><br></div><div>Kindest regards</div><div>Tom W</div></div></div><br><div class="gmail_quote"><div dir="ltr">On Wed, 28 Nov 2018 at 12:02, Haojian Wu via Phabricator via cfe-commits <<a href="mailto:cfe-commits@lists.llvm.org">cfe-commits@lists.llvm.org</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">hokein created this revision.<br>
hokein added a reviewer: ilya-biryukov.<br>
Herald added subscribers: kadircet, arphaman, jkorous, MaskRay, ioeric, mgorny.<br>
<br>
Include IndexBenchmark in check-clangd to make sure we won't forget to update<br>
it when doing breaking changes; also fix an out-of-date test input.<br>
<br>
<br>
Repository:<br>
  rCTE Clang Tools Extra<br>
<br>
<a href="https://reviews.llvm.org/D54998" rel="noreferrer" target="_blank">https://reviews.llvm.org/D54998</a><br>
<br>
Files:<br>
  test/CMakeLists.txt<br>
  test/clangd/Inputs/requests.json<br>
  test/clangd/index-tools.test<br>
<br>
<br>
Index: test/clangd/index-tools.test<br>
===================================================================<br>
--- test/clangd/index-tools.test<br>
+++ test/clangd/index-tools.test<br>
@@ -1,5 +1,4 @@<br>
 # RUN: clangd-indexer %p/Inputs/BenchmarkSource.cpp -- -I%p/Inputs > %t.index<br>
-# 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.<br>
 # REQUIRES: shell<br>
 # RUN: if [ -f %clangd-benchmark-dir/IndexBenchmark ]; then %clangd-benchmark-dir/IndexBenchmark %t.index %p/Inputs/requests.json --benchmark_min_time=0.01 ; fi<br>
 # Pass invalid JSON file and check that IndexBenchmark fails to parse it.<br>
Index: test/clangd/Inputs/requests.json<br>
===================================================================<br>
--- test/clangd/Inputs/requests.json<br>
+++ test/clangd/Inputs/requests.json<br>
@@ -1,7 +1,7 @@<br>
-[{"Limit":100,"ProximityPaths":["/usr/home/user/clang-tools-extra/clangd/benchmarks/IndexBenchmark.cpp"],"Query":"OMP","RestrictForCodeCompletion":true,"Scopes":["clang::"]},<br>
-{"Limit":100,"ProximityPaths":[],"Query":"s","RestrictForCodeCompletion":true,"Scopes":["llvm::", ""]},<br>
-{"Limit":100,"ProximityPaths":[],"Query":"sy","RestrictForCodeCompletion":true,"Scopes":["llvm::", ""]},<br>
-{"Limit":100,"ProximityPaths":[],"Query":"sys","RestrictForCodeCompletion":true,"Scopes":["llvm::", ""]},<br>
-{"Limit":100,"ProximityPaths":[],"Query":"sys","RestrictForCodeCompletion":true,"Scopes":["llvm::", ""]},<br>
-{"Limit":100,"ProximityPaths":[],"Query":"Dex","RestrictForCodeCompletion":true,"Scopes":["clang::clangd::", "clang::", "clang::clangd::dex::"]},<br>
-{"Limit":100,"ProximityPaths":[],"Query":"Variable","RestrictForCodeCompletion":true,"Scopes":[""]}]<br>
+[{"Limit":100,"ProximityPaths":["/usr/home/user/clang-tools-extra/clangd/benchmarks/IndexBenchmark.cpp"],"Query":"OMP","RestrictForCodeCompletion":true,"Scopes":["clang::"], "AnyScope":false},<br>
+{"Limit":100,"ProximityPaths":[],"Query":"s","RestrictForCodeCompletion":true,"Scopes":["llvm::", ""], "AnyScope":false},<br>
+{"Limit":100,"ProximityPaths":[],"Query":"sy","RestrictForCodeCompletion":true,"Scopes":["llvm::", ""], "AnyScope":false},<br>
+{"Limit":100,"ProximityPaths":[],"Query":"sys","RestrictForCodeCompletion":true,"Scopes":["llvm::", ""], "AnyScope":false},<br>
+{"Limit":100,"ProximityPaths":[],"Query":"sys","RestrictForCodeCompletion":true,"Scopes":["llvm::", ""], "AnyScope":false},<br>
+{"Limit":100,"ProximityPaths":[],"Query":"Dex","RestrictForCodeCompletion":true,"Scopes":["clang::clangd::", "clang::", "clang::clangd::dex::"],"AnyScope":false},<br>
+{"Limit":100,"ProximityPaths":[],"Query":"Variable","RestrictForCodeCompletion":true,"Scopes":[""], "AnyScope":false}]<br>
Index: test/CMakeLists.txt<br>
===================================================================<br>
--- test/CMakeLists.txt<br>
+++ test/CMakeLists.txt<br>
@@ -72,6 +72,10 @@<br>
   dexp<br>
   )<br>
<br>
+if (LLVM_INCLUDE_BENCHMARKS)<br>
+  list(APPEND CLANGD_TEST_DEPS IndexBenchmark)<br>
+endif()<br>
+<br>
 # Add lit test dependencies.<br>
 set(LLVM_UTILS_DEPS<br>
   FileCheck count not<br>
<br>
<br>
_______________________________________________<br>
cfe-commits mailing list<br>
<a href="mailto:cfe-commits@lists.llvm.org" target="_blank">cfe-commits@lists.llvm.org</a><br>
<a href="http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits" rel="noreferrer" target="_blank">http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits</a><br>
</blockquote></div>