From 7a2efe3c041328de444120a6be290813b85f78c9 Mon Sep 17 00:00:00 2001 From: Lukasz Dorau Date: Tue, 3 Sep 2019 09:57:41 +0200 Subject: [PATCH 1/4] appveyor: switch to Visual Studio 2017 This change is required because of the following issue: https://help.appveyor.com/discussions/problems/24684-problem-with-vcpkg-wrong-version-on-appveyor https://github.com/appveyor/ci/issues/3052 which cannot be fixed directly now. --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index e14f67dfdb..75bd8df076 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,5 +1,5 @@ version: 1.4.{build} -os: Visual Studio 2015 +os: Visual Studio 2017 platform: x64 environment: From ff87b338c1c6cf0a7c07b9b494360659936fb556 Mon Sep 17 00:00:00 2001 From: Lukasz Dorau Date: Wed, 4 Sep 2019 13:09:19 +0200 Subject: [PATCH 2/4] appveyor: set PMEM_IS_PMEM_FORCE in tests PMEM_IS_PMEM_FORCE is not set in tests and Appveyor build is timed out. --- appveyor.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/appveyor.yml b/appveyor.yml index 75bd8df076..fd1176e9cb 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -24,6 +24,7 @@ before_build: - cmake . -Bbuild -G "%GENERATOR%" -DCMAKE_TOOLCHAIN_FILE=c:/tools/vcpkg/scripts/buildsystems/vcpkg.cmake -DCMAKE_INSTALL_PREFIX=c:/install/libpmemobj-cpp + -DTESTS_USE_FORCED_PMEM=ON build_script: - msbuild build/ALL_BUILD.vcxproj /property:Configuration=%CONFIGURATION% @@ -38,4 +39,5 @@ test_script: - cmake . -G "%GENERATOR%" -DCMAKE_TOOLCHAIN_FILE=c:/tools/vcpkg/scripts/buildsystems/vcpkg.cmake -DCMAKE_PREFIX_PATH=c:/install/libpmemobj-cpp + -DTESTS_USE_FORCED_PMEM=ON - msbuild ALL_BUILD.vcxproj From abd2c2559c29b8ffc8f00ae14ddb4f80e3073fb9 Mon Sep 17 00:00:00 2001 From: Lukasz Dorau Date: Thu, 5 Sep 2019 12:13:36 +0200 Subject: [PATCH 3/4] appveyor: msbuild: set verbosity to minimal ... to reduce the Appveyor build time. --- appveyor.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index fd1176e9cb..30736435ac 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -28,11 +28,12 @@ before_build: build_script: - msbuild build/ALL_BUILD.vcxproj /property:Configuration=%CONFIGURATION% + /verbosity:minimal test_script: - cd build - ctest -C %CONFIGURATION% --output-on-failure -- msbuild INSTALL.vcxproj +- msbuild INSTALL.vcxproj /verbosity:minimal - cd .. # build standalone example - cd examples/map_cli @@ -40,4 +41,4 @@ test_script: -DCMAKE_TOOLCHAIN_FILE=c:/tools/vcpkg/scripts/buildsystems/vcpkg.cmake -DCMAKE_PREFIX_PATH=c:/install/libpmemobj-cpp -DTESTS_USE_FORCED_PMEM=ON -- msbuild ALL_BUILD.vcxproj +- msbuild ALL_BUILD.vcxproj /verbosity:minimal From 929eb949fedd419e6f734e3f6d7dba6ac6cbc96a Mon Sep 17 00:00:00 2001 From: Lukasz Dorau Date: Thu, 5 Sep 2019 10:20:43 +0200 Subject: [PATCH 4/4] Decrease Visual Studio warning level to W3 ... to reduce the Appveyor build time. --- tests/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 3e004bdb77..345dc90b30 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -36,7 +36,7 @@ add_check_whitespace(tests-common ${CMAKE_CURRENT_SOURCE_DIR}/common/*.*pp) add_check_whitespace(tests-cmake ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt) if(MSVC_VERSION) - add_flag(-W4) + add_flag(-W3) else() add_flag(-Wall) endif()