From 8bbd9b7694c705f79f86617dfa7fcfaeaf888c52 Mon Sep 17 00:00:00 2001 From: Jacob Dufault Date: Wed, 24 May 2017 20:06:05 -0700 Subject: [PATCH] Revert change to use CXTranslationUnit_Incomplete when indexing. It broke tests. --- src/command_line.cc | 6 +++--- src/indexer.cc | 2 +- src/test.cc | 2 -- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/command_line.cc b/src/command_line.cc index 62adf529..cc01ba81 100644 --- a/src/command_line.cc +++ b/src/command_line.cc @@ -2955,12 +2955,12 @@ int main(int argc, char** argv) { if (context.shouldExit()) return res; - for (int i = 0; i < 50; ++i) + for (int i = 0; i < 1; ++i) RunTests(); - for (int i = 0; i < 20; ++i) { + for (int i = 0; i < 1; ++i) { std::this_thread::sleep_for(std::chrono::seconds(5)); - std::cerr << "[POST] " << GetProcessMemoryUsedInMb() << std::endl; + std::cerr << "[POST] Memory usage: " << GetProcessMemoryUsedInMb() << "mb" << std::endl; } std::cerr << std::endl << "[Enter] to exit" << std::endl; diff --git a/src/indexer.cc b/src/indexer.cc index 18395a65..d4934580 100644 --- a/src/indexer.cc +++ b/src/indexer.cc @@ -1557,7 +1557,7 @@ std::vector> Parse( unsaved.Length = (unsigned long)file_contents->size(); unsaved_files.push_back(unsaved); } - clang::TranslationUnit tu(index, file, args, unsaved_files, CXTranslationUnit_KeepGoing | CXTranslationUnit_DetailedPreprocessingRecord | CXTranslationUnit_Incomplete); + clang::TranslationUnit tu(index, file, args, unsaved_files, CXTranslationUnit_KeepGoing | CXTranslationUnit_DetailedPreprocessingRecord); perf->index_parse = timer.ElapsedMicrosecondsAndReset(); diff --git a/src/test.cc b/src/test.cc index 5f9a79fd..ffa1567e 100644 --- a/src/test.cc +++ b/src/test.cc @@ -138,7 +138,6 @@ void RunTests() { &index, false /*dump_ast*/); -#if false // Parse expected output from the test, parse it into JSON document. std::unordered_map all_expected_output = ParseTestExpectation(path); for (auto& entry : all_expected_output) { @@ -183,7 +182,6 @@ void RunTests() { } } -#endif memory_after = GetProcessMemoryUsedInMb(); }