From 3022588e350c0cc0a275705384a714701f7d74d2 Mon Sep 17 00:00:00 2001 From: SChernykh Date: Wed, 14 Sep 2022 18:05:28 +0200 Subject: [PATCH] Run tests in debug config on Windows --- .github/workflows/c-cpp.yml | 4 ++-- .github/workflows/test-sync.yml | 6 +++--- CMakeLists.txt | 2 ++ tests/CMakeLists.txt | 2 ++ 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml index 2431e86..f60d416 100644 --- a/.github/workflows/c-cpp.yml +++ b/.github/workflows/c-cpp.yml @@ -273,11 +273,11 @@ jobs: mkdir build cd build cmake .. -G "${{ matrix.config.vs }}" - & "${{ matrix.config.msbuild }}msbuild" /m /p:Configuration=Release p2pool_tests.vcxproj + & "${{ matrix.config.msbuild }}msbuild" /m /p:Configuration=Debug p2pool_tests.vcxproj - name: Run tests run: | - cd tests/build/Release + cd tests/build/Debug ./p2pool_tests.exe - name: Archive binary diff --git a/.github/workflows/test-sync.yml b/.github/workflows/test-sync.yml index e22e081..16baf65 100644 --- a/.github/workflows/test-sync.yml +++ b/.github/workflows/test-sync.yml @@ -88,16 +88,16 @@ jobs: mkdir build cd build cmake .. -G "Visual Studio 17 2022" -DDEV_TEST_SYNC=ON - & "C:\\Program Files\\Microsoft Visual Studio\\2022\\Enterprise\\Msbuild\\Current\\Bin\\amd64\\msbuild" /m /p:Configuration=Release p2pool.vcxproj + & "C:\\Program Files\\Microsoft Visual Studio\\2022\\Enterprise\\Msbuild\\Current\\Bin\\amd64\\msbuild" /m /p:Configuration=Debug p2pool.vcxproj - name: Run p2pool timeout-minutes: 15 run: | - cd build/Release + cd build/Debug ./p2pool.exe --host p2pmd.xmrvsbeast.com --zmq-port 18084 --wallet 44MnN1f3Eto8DZYUWuE5XZNUtE3vcRzt2j6PzqWpPau34e6Cf4fAxt6X2MBmrm6F9YMEiMNjN6W4Shn4pLcfNAja621jwyg --no-cache --loglevel 6 - name: Archive p2pool.log uses: actions/upload-artifact@v2 with: name: p2pool_windows.log - path: build/Release/p2pool.log + path: build/Debug/p2pool.log diff --git a/CMakeLists.txt b/CMakeLists.txt index 4ef15a9..28c213f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -121,6 +121,8 @@ if (CMAKE_CXX_COMPILER_ID MATCHES MSVC) find_library(UV_LIBRARY NAMES uv_a PATHS "external/lib/libuv/Release") find_library(CURL_LIBRARY_DEBUG NAMES libcurld PATHS "external/lib/libcurl/Debug") find_library(CURL_LIBRARY NAMES libcurl PATHS "external/lib/libcurl/Release") + add_definitions(-D_DISABLE_VECTOR_ANNOTATION) + add_definitions(-D_DISABLE_STRING_ANNOTATION) elseif (CMAKE_CXX_COMPILER_ID MATCHES GNU OR CMAKE_CXX_COMPILER_ID MATCHES Clang) find_library(ZMQ_LIBRARY_DEBUG NAMES zmq libzmq.a) find_library(ZMQ_LIBRARY NAMES zmq libzmq.a) diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 8eb44f7..392ac34 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -90,6 +90,8 @@ else() find_library(UV_LIBRARY NAMES uv_a PATHS "../external/lib/libuv/Release") find_library(CURL_LIBRARY_DEBUG NAMES libcurld PATHS "../external/lib/libcurl/Debug") find_library(CURL_LIBRARY NAMES libcurl PATHS "../external/lib/libcurl/Release") + add_definitions(-D_DISABLE_VECTOR_ANNOTATION) + add_definitions(-D_DISABLE_STRING_ANNOTATION) elseif (CMAKE_CXX_COMPILER_ID MATCHES GNU OR CMAKE_CXX_COMPILER_ID MATCHES Clang) find_library(ZMQ_LIBRARY_DEBUG NAMES zmq libzmq.a) find_library(ZMQ_LIBRARY NAMES zmq libzmq.a)