[PATCH] D54998: [clangd] Build and test IndexBenchmark in check-clangd

[Tom Weaver via cfe-commits]

Hiya Haojian,

I've been looking over the build bots recently and believe r347753 may have
caused the following test:

clangd/index-tools.test

to start failing. You can see the failing test in the logs of the following
build bot:

http://lab.llvm.org:8011/builders/clang-s390x-linux/builds/20851/steps/ninja%20check%201/logs/stdio

is there any chance you can take a look?

Kindest regards
Tom W

On Wed, 28 Nov 2018 at 12:02, Haojian Wu via Phabricator via cfe-commits <
cfe-commits at lists.llvm.org> wrote:

> hokein created this revision.
> hokein added a reviewer: ilya-biryukov.
> Herald added subscribers: kadircet, arphaman, jkorous, MaskRay, ioeric,
> mgorny.
>
> Include IndexBenchmark in check-clangd to make sure we won't forget to
> update
> it when doing breaking changes; also fix an out-of-date test input.
>
>
> Repository:
>   rCTE Clang Tools Extra
>
> https://reviews.llvm.org/D54998
>
> Files:
>   test/CMakeLists.txt
>   test/clangd/Inputs/requests.json
>   test/clangd/index-tools.test
>
>
> Index: test/clangd/index-tools.test
> ===================================================================
> --- test/clangd/index-tools.test
> +++ test/clangd/index-tools.test
> @@ -1,5 +1,4 @@
>  # 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.
> Index: test/clangd/Inputs/requests.json
> ===================================================================
> --- test/clangd/Inputs/requests.json
> +++ 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::"]},
> -{"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":[""]}]
> +[{"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}]
> Index: test/CMakeLists.txt
> ===================================================================
> --- test/CMakeLists.txt
> +++ test/CMakeLists.txt
> @@ -72,6 +72,10 @@
>    dexp
>    )
>
> +if (LLVM_INCLUDE_BENCHMARKS)
> +  list(APPEND CLANGD_TEST_DEPS IndexBenchmark)
> +endif()
> +
>  # Add lit test dependencies.
>  set(LLVM_UTILS_DEPS
>    FileCheck count not
>
>
> _______________________________________________
> cfe-commits mailing list
> cfe-commits at lists.llvm.org
> http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.llvm.org/pipermail/cfe-commits/attachments/20181128/407b6460/attachment-0001.html>