diff --git a/clang-tools-extra/clangd/unittests/TUSchedulerTests.cpp b/clang-tools-extra/clangd/unittests/TUSchedulerTests.cpp --- a/clang-tools-extra/clangd/unittests/TUSchedulerTests.cpp +++ b/clang-tools-extra/clangd/unittests/TUSchedulerTests.cpp @@ -8,6 +8,7 @@ #include "Annotations.h" #include "Cancellation.h" +#include "ClangdServer.h" #include "Context.h" #include "Diagnostics.h" #include "Matchers.h" @@ -844,7 +845,9 @@ } CaptureTUStatus; MockFSProvider FS; MockCompilationDatabase CDB; - ClangdServer Server(CDB, FS, ClangdServer::optsForTest(), &CaptureTUStatus); + auto Opts = ClangdServer::optsForTest(); + Opts.AsyncThreadsCount = 0; + ClangdServer Server(CDB, FS, Opts, &CaptureTUStatus); Annotations Code("int m^ain () {}"); // We schedule the following tasks in the queue: @@ -858,27 +861,12 @@ ASSERT_TRUE(Server.blockUntilIdleForTest()); - EXPECT_THAT(CaptureTUStatus.allStatus(), - ElementsAre( - // Everything starts with ASTWorker starting to execute an - // update - TUState(PreambleAction::Idle, ASTAction::RunningAction), - // We build the preamble - TUState(PreambleAction::Building, ASTAction::RunningAction), - // We built the preamble, and issued ast built on ASTWorker - // thread. Preambleworker goes idle afterwards. - TUState(PreambleAction::Idle, ASTAction::RunningAction), - // Start task for building the ast, as a result of building - // preamble, on astworker thread. - TUState(PreambleAction::Idle, ASTAction::RunningAction), - // AST build starts. - TUState(PreambleAction::Idle, ASTAction::Building), - // AST built finished successfully - TUState(PreambleAction::Idle, ASTAction::Building), - // Running go to def - TUState(PreambleAction::Idle, ASTAction::RunningAction), - // ASTWorker goes idle. - TUState(PreambleAction::Idle, ASTAction::Idle))); + EXPECT_THAT( + CaptureTUStatus.allStatus(), + ElementsAre(TUState(PreambleAction::Building, ASTAction::Idle), + TUState(PreambleAction::Building, ASTAction::Building), + TUState(PreambleAction::Building, ASTAction::Building), + TUState(PreambleAction::Idle, ASTAction::Building))); } TEST_F(TUSchedulerTests, CommandLineErrors) {