Merge pull request #18 from progsource/appveyor

try out appveyor
这个提交包含在:
Petra Baranski 2019-02-19 02:51:43 +01:00 提交者 GitHub
当前提交 b167316d52
找不到此签名对应的密钥
GPG 密钥 ID: 4AEE18F83AFDEB23
共有 4 个文件被更改,包括 44 次插入20 次删除

查看文件

@ -8,5 +8,5 @@ indent_style = space
insert_final_newline = true insert_final_newline = true
trim_trailing_whitespace = true trim_trailing_whitespace = true
[*.{h,hh,hpp,c,cc,cpp,cxx}] [*.{h,hh,hpp,c,cc,cpp,cxx,yml}]
indent_size = 2 indent_size = 2

查看文件

@ -25,10 +25,17 @@ file(GLOB_RECURSE MADDY_TESTS_FILES ${CMAKE_CURRENT_SOURCE_DIR}/tests/maddy/*.cp
# ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------
set( if (UNIX)
set(
CMAKE_CXX_FLAGS CMAKE_CXX_FLAGS
"${CMAKE_CXX_FLAGS} -g -std=c++${MADDY_CPP_VERSION} -Wall -Wpedantic -Wextra -Wno-ignored-qualifiers -fno-rtti -fno-exceptions -fsanitize=address -fno-omit-frame-pointer" "${CMAKE_CXX_FLAGS} -g -std=c++${MADDY_CPP_VERSION} -Wall -Wpedantic -Wextra -Wno-ignored-qualifiers -fno-rtti -fno-exceptions -fsanitize=address -fno-omit-frame-pointer"
) )
else()
set(
CMAKE_CXX_FLAGS
"${CMAKE_CXX_FLAGS} -std=c++${MADDY_CPP_VERSION}"
)
endif()
# ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------

15
appveyor.yml 普通文件
查看文件

@ -0,0 +1,15 @@
image: Visual Studio 2017
install:
- cmd: git submodule update --init --recursive
before_build:
- cmd: mkdir tmp
- cmd: cd tmp
- cmd: cmake -G "Visual Studio 15 Win64" ..
build:
project: $(APPVEYOR_BUILD_FOLDER)\tmp\$(APPVEYOR_PROJECT_NAME).sln
test_script:
- cmd: ctest -VV -C "Debug"

查看文件

@ -157,7 +157,8 @@ protected:
{ {
bool hasMetNonSpace = false; bool hasMetNonSpace = false;
uint32_t indentation = std::count_if( uint32_t indentation = static_cast<uint32_t>(
std::count_if(
line.begin(), line.begin(),
line.end(), line.end(),
[&hasMetNonSpace](unsigned char c) [&hasMetNonSpace](unsigned char c)
@ -175,6 +176,7 @@ protected:
hasMetNonSpace = true; hasMetNonSpace = true;
return false; return false;
} }
)
); );
return indentation; return indentation;