Zengtudor/ccls
1
0
Fork 0
mirror of https://github.com/MaskRay/ccls.git synced 2025-06-07 08:44:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge 6a34664f32 into 2ad71f1058

Browse Source
This commit is contained in:
xerrni 2020-12-14 14:47:39 +01:00 committed by GitHub
commit 0b6a448df9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/test.cc
View File

@ -260,15 +260,16 @@ findDbForPathEnding(const std::string &path,
bool runIndexTests(const std::string &filter_path, bool enable_update) { bool runIndexTests(const std::string &filter_path, bool enable_update) {
gTestOutputMode = true; gTestOutputMode = true;
std::string version = LLVM_VERSION_STRING; std::string version = LLVM_VERSION_STRING;
const int majorVersion = LLVM_VERSION_MAJOR;
// Index tests change based on the version of clang used. // Index tests change based on the version of clang used.
static const char kRequiredClangVersion[] = "6.0.0"; const int kMinRequiredClangVersion = 6;
if (version != kRequiredClangVersion && if (majorVersion < kMinRequiredClangVersion &&
version.find("svn") == std::string::npos) { version.find("svn") == std::string::npos) {
fprintf(stderr, fprintf(stderr,
"Index tests must be run using clang version %s, ccls is running " "Index tests must be run using clang major version >= %d, ccls is running "
"with %s\n", "with %s\n",
kRequiredClangVersion, version.c_str()); kMinRequiredClangVersion, version.c_str());
return false; return false;
} }

3
src/threaded_queue.hh
View File

@ -46,6 +46,9 @@ private:
struct MultiQueueWaiter { struct MultiQueueWaiter {
std::condition_variable_any cv; std::condition_variable_any cv;
~MultiQueueWaiter() {
cv.notify_all();
}
static bool hasState(std::initializer_list<BaseThreadQueue *> queues) { static bool hasState(std::initializer_list<BaseThreadQueue *> queues) {
for (BaseThreadQueue *queue : queues) { for (BaseThreadQueue *queue : queues) {