From 3b775c5a49ae595e68cc5d0822c5034ecfceab17 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20Wo=CC=81jcik?= <3044353+pwojcikdev@users.noreply.github.com> Date: Fri, 28 Apr 2023 00:46:42 +0200 Subject: [PATCH] Remove `CI_TEST` option --- CMakeLists.txt | 4 ---- ci/actions/windows/build.ps1 | 1 - ci/build-ci.sh | 1 - ci/build.sh | 1 - nano/core_test/CMakeLists.txt | 2 +- nano/core_test/network.cpp | 2 +- nano/lib/CMakeLists.txt | 1 - 7 files changed, 2 insertions(+), 10 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index cdd370f5..9a213637 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -34,10 +34,6 @@ if(COVERAGE) include(CoverageTest) endif() -set(CI_TEST - 0 - CACHE STRING "") - if(MSVC) add_definitions(/MP) endif() diff --git a/ci/actions/windows/build.ps1 b/ci/actions/windows/build.ps1 index b984534e..af867129 100644 --- a/ci/actions/windows/build.ps1 +++ b/ci/actions/windows/build.ps1 @@ -31,7 +31,6 @@ else { } $env:NETWORK_CFG = "dev" $env:NANO_TEST = "-DNANO_TEST=ON" - $env:CI = '-DCI_TEST="1"' $env:RUN = "test" } diff --git a/ci/build-ci.sh b/ci/build-ci.sh index eee9cece..f03b00c9 100755 --- a/ci/build-ci.sh +++ b/ci/build-ci.sh @@ -48,7 +48,6 @@ cmake \ -DNANO_WARN_TO_ERR=ON \ -DCMAKE_BUILD_TYPE=${BUILD_TYPE:-Debug} \ -DQt5_DIR=${qt_dir} \ --DCI_TEST="1" \ ${BACKTRACE:-} \ ${SANITIZERS:-} \ .. diff --git a/ci/build.sh b/ci/build.sh index bf939d54..676c8f76 100755 --- a/ci/build.sh +++ b/ci/build.sh @@ -44,7 +44,6 @@ cmake \ -DPORTABLE=ON \ -DNANO_WARN_TO_ERR=ON \ -DCMAKE_BUILD_TYPE=${BUILD_TYPE} \ --DCI_TEST=ON \ -DQt5_DIR=${NANO_QT_DIR:-} \ ${BACKTRACE:-} \ ${SANITIZERS:-} \ diff --git a/nano/core_test/CMakeLists.txt b/nano/core_test/CMakeLists.txt index aa5a123d..f2aae4d2 100644 --- a/nano/core_test/CMakeLists.txt +++ b/nano/core_test/CMakeLists.txt @@ -61,7 +61,7 @@ add_executable( target_compile_definitions( core_test PRIVATE -DTAG_VERSION_STRING=${TAG_VERSION_STRING} - -DGIT_COMMIT_HASH=${GIT_COMMIT_HASH} -DCI=${CI_TEST}) + -DGIT_COMMIT_HASH=${GIT_COMMIT_HASH}) target_link_libraries( core_test diff --git a/nano/core_test/network.cpp b/nano/core_test/network.cpp index 227be9a8..55efe935 100644 --- a/nano/core_test/network.cpp +++ b/nano/core_test/network.cpp @@ -1014,7 +1014,7 @@ TEST (network, tcp_message_manager) // This should give sufficient time to execute put_message // and prove that it waits on condition variable - std::this_thread::sleep_for (CI ? 200ms : 100ms); + std::this_thread::sleep_for (200ms); ASSERT_EQ (manager.entries.size (), manager.max_entries); ASSERT_EQ (manager.get_message ().node_id, item.node_id); diff --git a/nano/lib/CMakeLists.txt b/nano/lib/CMakeLists.txt index 53cbc27c..20024061 100644 --- a/nano/lib/CMakeLists.txt +++ b/nano/lib/CMakeLists.txt @@ -124,5 +124,4 @@ target_compile_definitions( -DMINOR_VERSION_STRING=${CPACK_PACKAGE_VERSION_MINOR} -DPATCH_VERSION_STRING=${CPACK_PACKAGE_VERSION_PATCH} -DPRE_RELEASE_VERSION_STRING=${CPACK_PACKAGE_VERSION_PRE_RELEASE} - -DCI=${CI_TEST} PUBLIC -DACTIVE_NETWORK=${ACTIVE_NETWORK})