diff options
author | Ilya Biryukov <ibiryukov@google.com> | 2019-05-09 12:21:28 +0000 |
---|---|---|
committer | Ilya Biryukov <ibiryukov@google.com> | 2019-05-09 12:21:28 +0000 |
commit | 2612bac747b03da658b1b6b8a53b3cd08c77c27c (patch) | |
tree | ae8529fd0e0bb54d6edfd8c94cfe91cf64e6ffe0 | |
parent | f45c8b21756701642d8886bc7b6b7fbcae3c11c0 (diff) | |
download | bcm5719-llvm-2612bac747b03da658b1b6b8a53b3cd08c77c27c.tar.gz bcm5719-llvm-2612bac747b03da658b1b6b8a53b3cd08c77c27c.zip |
[clangd] Fix a TSAN warning in TUSchedulerTests
llvm-svn: 360336
-rw-r--r-- | clang-tools-extra/clangd/unittests/TUSchedulerTests.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/clang-tools-extra/clangd/unittests/TUSchedulerTests.cpp b/clang-tools-extra/clangd/unittests/TUSchedulerTests.cpp index a7d032ccc57..1b51bd78a3f 100644 --- a/clang-tools-extra/clangd/unittests/TUSchedulerTests.cpp +++ b/clang-tools-extra/clangd/unittests/TUSchedulerTests.cpp @@ -673,10 +673,14 @@ TEST_F(TUSchedulerTests, TUStatus) { AllStatus.push_back(Status); } - std::vector<TUStatus> AllStatus; + std::vector<TUStatus> allStatus() { + std::lock_guard<std::mutex> Lock(Mutex); + return AllStatus; + } private: std::mutex Mutex; + std::vector<TUStatus> AllStatus; } CaptureTUStatus; MockFSProvider FS; MockCompilationDatabase CDB; @@ -693,7 +697,7 @@ TEST_F(TUSchedulerTests, TUStatus) { ASSERT_TRUE(Server.blockUntilIdleForTest()); - EXPECT_THAT(CaptureTUStatus.AllStatus, + EXPECT_THAT(CaptureTUStatus.allStatus(), ElementsAre( // Statuses of "Update" action. TUState(TUAction::RunningAction, "Update"), |