Zengtudor/ccls
1
0
Fork 0
mirror of https://github.com/MaskRay/ccls.git synced 2025-02-16 21:58:08 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix AppVeyor

Browse Source
This commit is contained in:
Jacob Dufault 2018-01-07 02:39:54 -08:00
parent 0ac0039c61
commit 6661410483
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.appveyor.yml
View File

@ -9,7 +9,7 @@ install:
build_script: build_script:
- cd C:\projects\cquery - cd C:\projects\cquery
- python waf configure --msvc_version="msvc 14.0" --msvc_targets=x64 - python waf configure --msvc_version="msvc 15.0"
- python waf build - python waf build
- ps: | - ps: |
$dir = "cquery-${env:appveyor_build_version}-win64" $dir = "cquery-${env:appveyor_build_version}-win64"
@ -26,7 +26,5 @@ artifacts:
- path: 'cquery-*.zip' - path: 'cquery-*.zip'
cache: cache:
- C:\projects\cquery\build\LLVM-4.0.0-win64.exe
- C:\projects\cquery\build\LLVM-5.0.1-win64.exe - C:\projects\cquery\build\LLVM-5.0.1-win64.exe
- C:\projects\cquery\build\LLVM-4.0.0-win64\
- C:\projects\cquery\build\LLVM-5.0.1-win64\ - C:\projects\cquery\build\LLVM-5.0.1-win64\

5
src/test.cc
View File

@ -124,6 +124,8 @@ bool RunIndexTests(const std::string& filter_path, bool enable_update) {
bool success = true; bool success = true;
bool update_all = false; bool update_all = false;
// FIXME: show diagnostics in STL/headers when running tests. At the moment
// this can be done by constructing ClangIndex index(1, 1);
ClangIndex index; ClangIndex index;
for (std::string path : GetFilesInFolder("index_tests", true /*recursive*/, for (std::string path : GetFilesInFolder("index_tests", true /*recursive*/,
@ -152,8 +154,9 @@ bool RunIndexTests(const std::string& filter_path, bool enable_update) {
bool had_extra_flags = !flags.empty(); bool had_extra_flags = !flags.empty();
if (!AnyStartsWith(flags, "-x")) if (!AnyStartsWith(flags, "-x"))
flags.push_back("-xc++"); flags.push_back("-xc++");
// Use c++14 by default, because MSVC STL is written assuming that.
if (!AnyStartsWith(flags, "-std")) if (!AnyStartsWith(flags, "-std"))
flags.push_back("-std=c++11"); flags.push_back("-std=c++14");
flags.push_back("-resource-dir=" + GetDefaultResourceDirectory()); flags.push_back("-resource-dir=" + GetDefaultResourceDirectory());
if (had_extra_flags) { if (had_extra_flags) {
std::cout << "For " << path << std::endl; std::cout << "For " << path << std::endl;