Author: sammccall Date: Tue Jan 16 04:21:24 2018 New Revision: 322547 URL: http://llvm.org/viewvc/llvm-project?rev=322547&view=rev Log: [clangd] Avoid combinatorial explosion in CodeCompleteTests.
Summary: This test dominates our unit test runtime, and the change speeds it up by 10x. We lose coverage of some combinations of flags, but I'm not sure that's finding many bugs. 3300 -> 300ms on my machine (3800 -> 800ms for the whole of CompletionTest). Reviewers: ilya-biryukov Subscribers: klimek, cfe-commits Differential Revision: https://reviews.llvm.org/D42063 Modified: clang-tools-extra/trunk/unittests/clangd/CodeCompleteTests.cpp Modified: clang-tools-extra/trunk/unittests/clangd/CodeCompleteTests.cpp URL: http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/unittests/clangd/CodeCompleteTests.cpp?rev=322547&r1=322546&r2=322547&view=diff ============================================================================== --- clang-tools-extra/trunk/unittests/clangd/CodeCompleteTests.cpp (original) +++ clang-tools-extra/trunk/unittests/clangd/CodeCompleteTests.cpp Tue Jan 16 04:21:24 2018 @@ -255,26 +255,26 @@ void TestGlobalScopeCompletion(clangd::C } TEST(CompletionTest, CompletionOptions) { - clangd::CodeCompleteOptions Opts; - for (bool IncludeMacros : {true, false}) { - Opts.IncludeMacros = IncludeMacros; - for (bool IncludeGlobals : {true, false}) { - Opts.IncludeGlobals = IncludeGlobals; - for (bool IncludeBriefComments : {true, false}) { - Opts.IncludeBriefComments = IncludeBriefComments; - for (bool EnableSnippets : {true, false}) { - Opts.EnableSnippets = EnableSnippets; - for (bool IncludeCodePatterns : {true, false}) { - Opts.IncludeCodePatterns = IncludeCodePatterns; - for (bool IncludeIneligibleResults : {true, false}) { - Opts.IncludeIneligibleResults = IncludeIneligibleResults; - TestAfterDotCompletion(Opts); - TestGlobalScopeCompletion(Opts); - } - } - } - } - } + auto Test = [&](const clangd::CodeCompleteOptions &Opts) { + TestAfterDotCompletion(Opts); + TestGlobalScopeCompletion(Opts); + }; + // We used to test every combination of options, but that got too slow (2^N). + auto Flags = { + &clangd::CodeCompleteOptions::IncludeMacros, + &clangd::CodeCompleteOptions::IncludeGlobals, + &clangd::CodeCompleteOptions::IncludeBriefComments, + &clangd::CodeCompleteOptions::EnableSnippets, + &clangd::CodeCompleteOptions::IncludeCodePatterns, + &clangd::CodeCompleteOptions::IncludeIneligibleResults, + }; + // Test default options. + Test({}); + // Test with one flag flipped. + for (auto &F : Flags) { + clangd::CodeCompleteOptions O; + O.*F ^= true; + Test(O); } } _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
