From 044d7b7a267b9db6fd853316cde9a891d7f1551c Mon Sep 17 00:00:00 2001 From: eidheim Date: Tue, 28 Nov 2017 11:41:46 +0100 Subject: [PATCH] Fixed tests on Linux --- tests/code_complete_results_test.cc | 13 ++++++++++++- tests/diagnostics_test.cc | 13 ++++++++++++- 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/tests/code_complete_results_test.cc b/tests/code_complete_results_test.cc index 0e4959b..cddd7cb 100644 --- a/tests/code_complete_results_test.cc +++ b/tests/code_complete_results_test.cc @@ -1,13 +1,24 @@ #include "clangmm.h" #include #include +#include int main() { std::string tests_path=LIBCLANGMM_TESTS_PATH; std::string path(tests_path+"/case/main.cpp"); + std::vector arguments; + auto clang_version_string=clangmm::to_string(clang_getClangVersion()); + const static std::regex clang_version_regex("^[A-Za-z ]+([0-9.]+).*$"); + std::smatch sm; + if(std::regex_match(clang_version_string, sm, clang_version_regex)) { + auto clang_version=sm[1].str(); + arguments.emplace_back("-I/usr/lib/clang/"+clang_version+"/include"); + arguments.emplace_back("-I/usr/lib64/clang/"+clang_version+"/include"); // For Fedora + } + clangmm::Index index(0, 0); - clangmm::TranslationUnit tu(index, path, {}); + clangmm::TranslationUnit tu(index, path, arguments); std::string buffer="#include \n" "int main(int argc, char *argv[]) {\n" diff --git a/tests/diagnostics_test.cc b/tests/diagnostics_test.cc index c6bc419..a7e72d7 100644 --- a/tests/diagnostics_test.cc +++ b/tests/diagnostics_test.cc @@ -2,6 +2,7 @@ #include #include #include +#include using namespace std; @@ -11,7 +12,17 @@ int main() { clangmm::Index index(0, 0); - clangmm::TranslationUnit tu(index, path, {}); + std::vector arguments; + auto clang_version_string=clangmm::to_string(clang_getClangVersion()); + const static std::regex clang_version_regex("^[A-Za-z ]+([0-9.]+).*$"); + std::smatch sm; + if(std::regex_match(clang_version_string, sm, clang_version_regex)) { + auto clang_version=sm[1].str(); + arguments.emplace_back("-I/usr/lib/clang/"+clang_version+"/include"); + arguments.emplace_back("-I/usr/lib64/clang/"+clang_version+"/include"); // For Fedora + } + + clangmm::TranslationUnit tu(index, path, arguments); auto diagnostics=tu.get_diagnostics(); assert(diagnostics.size()>0);