Turn some Tests to RAPIDJSON_USE_MEMBERSMAP in CI.

This commit is contained in:
ylavic 2021-04-01 23:55:15 +02:00
parent fc08f4f61b
commit be4a5a9087
2 changed files with 42 additions and 22 deletions

View File

@ -28,59 +28,65 @@ env:
matrix: matrix:
include: include:
# gcc # gcc
- env: CONF=release ARCH=x86 CXX11=ON CXX17=OFF - env: CONF=release ARCH=x86 CXX11=ON CXX17=OFF MEMBERSMAP=OFF
compiler: gcc compiler: gcc
arch: amd64 arch: amd64
- env: CONF=release ARCH=x86_64 CXX11=ON CXX17=OFF - env: CONF=release ARCH=x86_64 CXX11=ON CXX17=OFF MEMBERSMAP=OFF
compiler: gcc compiler: gcc
arch: amd64 arch: amd64
- env: CONF=debug ARCH=x86 CXX11=OFF CXX17=OFF - env: CONF=release ARCH=x86_64 CXX11=ON CXX17=OFF MEMBERSMAP=ON
compiler: gcc compiler: gcc
arch: amd64 arch: amd64
- env: CONF=debug ARCH=x86_64 CXX11=OFF CXX17=OFF - env: CONF=debug ARCH=x86 CXX11=OFF CXX17=OFF MEMBERSMAP=OFF
compiler: gcc compiler: gcc
arch: amd64 arch: amd64
- env: CONF=debug ARCH=x86 CXX11=OFF CXX17=ON CXX_FLAGS='-D_GLIBCXX_DEBUG' - env: CONF=debug ARCH=x86_64 CXX11=OFF CXX17=OFF MEMBERSMAP=OFF
compiler: gcc
arch: amd64/
- env: CONF=debug ARCH=x86_64 CXX11=OFF CXX17=ON CXX_FLAGS='-D_GLIBCXX_DEBUG'
compiler: gcc compiler: gcc
arch: amd64 arch: amd64
- env: CONF=release ARCH=aarch64 CXX11=ON CXX17=OFF - env: CONF=debug ARCH=x86 CXX11=OFF CXX17=ON MEMBERSMAP=ON CXX_FLAGS='-D_GLIBCXX_DEBUG'
compiler: gcc
arch: amd64
- env: CONF=debug ARCH=x86_64 CXX11=OFF CXX17=ON MEMBERSMAP=ON CXX_FLAGS='-D_GLIBCXX_DEBUG'
compiler: gcc
arch: amd64
- env: CONF=release ARCH=aarch64 CXX11=ON CXX17=OFF MEMBERSMAP=OFF
compiler: gcc compiler: gcc
arch: arm64 arch: arm64
- env: CONF=release ARCH=aarch64 CXX11=OFF CXX17=OFF - env: CONF=release ARCH=aarch64 CXX11=OFF CXX17=OFF MEMBERSMAP=OFF
compiler: gcc compiler: gcc
arch: arm64 arch: arm64
- env: CONF=release ARCH=aarch64 CXX11=OFF CXX17=ON - env: CONF=release ARCH=aarch64 CXX11=OFF CXX17=ON MEMBERSMAP=ON
compiler: gcc compiler: gcc
arch: arm64 arch: arm64
# clang # clang
- env: CONF=release ARCH=x86 CXX11=ON CXX17=OFF CCACHE_CPP2=yes - env: CONF=release ARCH=x86 CXX11=ON CXX17=OFF MEMBERSMAP=ON CCACHE_CPP2=yes
compiler: clang compiler: clang
arch: amd64 arch: amd64
- env: CONF=release ARCH=x86_64 CXX11=ON CXX17=OFF CCACHE_CPP2=yes - env: CONF=release ARCH=x86_64 CXX11=ON CXX17=OFF MEMBERSMAP=ON CCACHE_CPP2=yes
compiler: clang compiler: clang
arch: amd64 arch: amd64
- env: CONF=debug ARCH=x86 CXX11=OFF CXX17=OFF CCACHE_CPP2=yes - env: CONF=release ARCH=x86_64 CXX11=ON CXX17=OFF MEMBERSMAP=OFF CCACHE_CPP2=yes
compiler: clang compiler: clang
arch: amd64 arch: amd64
- env: CONF=debug ARCH=x86_64 CXX11=OFF CXX17=OFF CCACHE_CPP2=yes - env: CONF=debug ARCH=x86 CXX11=OFF CXX17=OFF MEMBERSMAP=ON CCACHE_CPP2=yes
compiler: clang compiler: clang
arch: amd64 arch: amd64
- env: CONF=debug ARCH=x86 CXX11=OFF CXX17=ON CCACHE_CPP2=yes - env: CONF=debug ARCH=x86_64 CXX11=OFF CXX17=OFF MEMBERSMAP=ON CCACHE_CPP2=yes
compiler: clang compiler: clang
arch: amd64 arch: amd64
- env: CONF=debug ARCH=x86_64 CXX11=OFF CXX17=ON CCACHE_CPP2=yes - env: CONF=debug ARCH=x86 CXX11=OFF CXX17=ON MEMBERSMAP=OFF CCACHE_CPP2=yes
compiler: clang compiler: clang
arch: amd64 arch: amd64
- env: CONF=debug ARCH=aarch64 CXX11=ON CXX17=OFF CCACHE_CPP2=yes - env: CONF=debug ARCH=x86_64 CXX11=OFF CXX17=ON MEMBERSMAP=OFF CCACHE_CPP2=yes
compiler: clang
arch: amd64
- env: CONF=debug ARCH=aarch64 CXX11=ON CXX17=OFF MEMBERSMAP=ON CCACHE_CPP2=yes
compiler: clang compiler: clang
arch: arm64 arch: arm64
- env: CONF=debug ARCH=aarch64 CXX11=OFF CXX17=OFF CCACHE_CPP2=yes - env: CONF=debug ARCH=aarch64 CXX11=OFF CXX17=OFF MEMBERSMAP=ON CCACHE_CPP2=yes
compiler: clang compiler: clang
arch: arm64 arch: arm64
- env: CONF=debug ARCH=aarch64 CXX11=OFF CXX17=ON CCACHE_CPP2=yes - env: CONF=debug ARCH=aarch64 CXX11=OFF CXX17=ON MEMBERSMAP=OFF CCACHE_CPP2=yes
compiler: clang compiler: clang
arch: arm64 arch: arm64
# coverage report # coverage report
@ -93,7 +99,7 @@ matrix:
after_success: after_success:
- pip install --user cpp-coveralls - pip install --user cpp-coveralls
- coveralls -r .. --gcov-options '\-lp' -e thirdparty -e example -e test -e build/CMakeFiles -e include/rapidjson/msinttypes -e include/rapidjson/internal/meta.h -e include/rapidjson/error/en.h - coveralls -r .. --gcov-options '\-lp' -e thirdparty -e example -e test -e build/CMakeFiles -e include/rapidjson/msinttypes -e include/rapidjson/internal/meta.h -e include/rapidjson/error/en.h
- env: CONF=debug ARCH=x86_64 GCOV_FLAGS='--coverage' CXX_FLAGS='-O0' CXX11=ON CXX17=OFF - env: CONF=debug ARCH=x86_64 GCOV_FLAGS='--coverage' CXX_FLAGS='-O0' CXX11=ON CXX17=OFF MEMBERSMAP=ON
compiler: gcc compiler: gcc
arch: amd64 arch: amd64
cache: cache:
@ -146,6 +152,7 @@ script:
eval "ARCH_FLAGS=\${ARCH_FLAGS_${ARCH}}" ; eval "ARCH_FLAGS=\${ARCH_FLAGS_${ARCH}}" ;
(cd build && cmake (cd build && cmake
-DRAPIDJSON_HAS_STDSTRING=ON -DRAPIDJSON_HAS_STDSTRING=ON
-DRAPIDJSON_USE_MEMBERSMAP=$MEMBERSMAP
-DRAPIDJSON_BUILD_CXX11=$CXX11 -DRAPIDJSON_BUILD_CXX11=$CXX11
-DRAPIDJSON_BUILD_CXX17=$CXX17 -DRAPIDJSON_BUILD_CXX17=$CXX17
-DCMAKE_VERBOSE_MAKEFILE=ON -DCMAKE_VERBOSE_MAKEFILE=ON

View File

@ -15,70 +15,83 @@ environment:
VS_PLATFORM: win32 VS_PLATFORM: win32
CXX11: OFF CXX11: OFF
CXX17: OFF CXX17: OFF
MEMBERSMAP: OFF
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013 - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013
VS_VERSION: 10 2010 VS_VERSION: 10 2010
VS_PLATFORM: x64 VS_PLATFORM: x64
CXX11: OFF CXX11: OFF
CXX17: OFF CXX17: OFF
MEMBERSMAP: ON
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013 - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013
VS_VERSION: 11 2012 VS_VERSION: 11 2012
VS_PLATFORM: win32 VS_PLATFORM: win32
CXX11: OFF CXX11: OFF
CXX17: OFF CXX17: OFF
MEMBERSMAP: ON
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013 - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013
VS_VERSION: 11 2012 VS_VERSION: 11 2012
VS_PLATFORM: x64 VS_PLATFORM: x64
CXX11: OFF CXX11: OFF
CXX17: OFF CXX17: OFF
MEMBERSMAP: OFF
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013 - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013
VS_VERSION: 12 2013 VS_VERSION: 12 2013
VS_PLATFORM: win32 VS_PLATFORM: win32
CXX11: OFF CXX11: OFF
CXX17: OFF CXX17: OFF
MEMBERSMAP: OFF
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013 - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013
VS_VERSION: 12 2013 VS_VERSION: 12 2013
VS_PLATFORM: x64 VS_PLATFORM: x64
CXX11: OFF CXX11: OFF
CXX17: OFF CXX17: OFF
MEMBERSMAP: ON
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
VS_VERSION: 14 2015 VS_VERSION: 14 2015
VS_PLATFORM: win32 VS_PLATFORM: win32
CXX11: OFF CXX11: OFF
CXX17: OFF CXX17: OFF
MEMBERSMAP: ON
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
VS_VERSION: 14 2015 VS_VERSION: 14 2015
VS_PLATFORM: x64 VS_PLATFORM: x64
CXX11: OFF CXX11: OFF
CXX17: OFF CXX17: OFF
MEMBERSMAP: OFF
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
VS_VERSION: 15 2017 VS_VERSION: 15 2017
VS_PLATFORM: win32 VS_PLATFORM: win32
CXX11: OFF CXX11: OFF
CXX17: OFF CXX17: OFF
MEMBERSMAP: OFF
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
VS_VERSION: 15 2017 VS_VERSION: 15 2017
VS_PLATFORM: x64 VS_PLATFORM: x64
CXX11: OFF CXX11: OFF
CXX17: OFF CXX17: OFF
MEMBERSMAP: ON
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
VS_VERSION: 15 2017 VS_VERSION: 15 2017
VS_PLATFORM: x64 VS_PLATFORM: x64
CXX11: ON CXX11: ON
CXX17: OFF CXX17: OFF
MEMBERSMAP: OFF
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
VS_VERSION: 15 2017 VS_VERSION: 15 2017
VS_PLATFORM: x64 VS_PLATFORM: x64
CXX11: OFF CXX11: OFF
CXX17: ON CXX17: ON
MEMBERSMAP: OFF
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019 - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
VS_VERSION: 16 2019 VS_VERSION: 16 2019
VS_PLATFORM: x64 VS_PLATFORM: x64
CXX11: OFF CXX11: OFF
CXX17: ON CXX17: ON
MEMBERSMAP: ON
before_build: before_build:
- git submodule update --init --recursive - git submodule update --init --recursive
- cmake -H. -BBuild/VS -G "Visual Studio %VS_VERSION%" -DCMAKE_GENERATOR_PLATFORM=%VS_PLATFORM% -DCMAKE_VERBOSE_MAKEFILE=ON -DBUILD_SHARED_LIBS=true -DRAPIDJSON_BUILD_CXX11=%CXX11% -DRAPIDJSON_BUILD_CXX17=%CXX17% -Wno-dev - cmake -H. -BBuild/VS -G "Visual Studio %VS_VERSION%" -DCMAKE_GENERATOR_PLATFORM=%VS_PLATFORM% -DCMAKE_VERBOSE_MAKEFILE=ON -DBUILD_SHARED_LIBS=true -DRAPIDJSON_BUILD_CXX11=%CXX11% -DRAPIDJSON_BUILD_CXX17=%CXX17% -DRAPIDJSON_USE_MEMBERSMAP=%MEMBERSMAP% -Wno-dev
build: build:
project: Build\VS\RapidJSON.sln project: Build\VS\RapidJSON.sln