dn724/dncurrency
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

Remove CI_TEST option

Browse source
This commit is contained in:
Piotr Wójcik 2023-04-28 00:46:42 +02:00
commit 3b775c5a49
7 changed files with 2 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

4
CMakeLists.txt
View file

@ -34,10 +34,6 @@ if(COVERAGE)
include(CoverageTest) include(CoverageTest)
endif() endif()
set(CI_TEST
0
CACHE STRING "")
if(MSVC) if(MSVC)
add_definitions(/MP) add_definitions(/MP)
endif() endif()

1
ci/actions/windows/build.ps1
View file

@ -31,7 +31,6 @@ else {
} }
$env:NETWORK_CFG = "dev" $env:NETWORK_CFG = "dev"
$env:NANO_TEST = "-DNANO_TEST=ON" $env:NANO_TEST = "-DNANO_TEST=ON"
$env:CI = '-DCI_TEST="1"'
$env:RUN = "test" $env:RUN = "test"
} }

1
ci/build-ci.sh
View file

@ -48,7 +48,6 @@ cmake \
-DNANO_WARN_TO_ERR=ON \ -DNANO_WARN_TO_ERR=ON \
-DCMAKE_BUILD_TYPE=${BUILD_TYPE:-Debug} \ -DCMAKE_BUILD_TYPE=${BUILD_TYPE:-Debug} \
-DQt5_DIR=${qt_dir} \ -DQt5_DIR=${qt_dir} \
-DCI_TEST="1" \
${BACKTRACE:-} \ ${BACKTRACE:-} \
${SANITIZERS:-} \ ${SANITIZERS:-} \
.. ..

1
ci/build.sh
View file

@ -44,7 +44,6 @@ cmake \
-DPORTABLE=ON \ -DPORTABLE=ON \
-DNANO_WARN_TO_ERR=ON \ -DNANO_WARN_TO_ERR=ON \
-DCMAKE_BUILD_TYPE=${BUILD_TYPE} \ -DCMAKE_BUILD_TYPE=${BUILD_TYPE} \
-DCI_TEST=ON \
-DQt5_DIR=${NANO_QT_DIR:-} \ -DQt5_DIR=${NANO_QT_DIR:-} \
${BACKTRACE:-} \ ${BACKTRACE:-} \
${SANITIZERS:-} \ ${SANITIZERS:-} \

2
nano/core_test/CMakeLists.txt
View file

@ -61,7 +61,7 @@ add_executable(
target_compile_definitions( target_compile_definitions(
core_test PRIVATE -DTAG_VERSION_STRING=${TAG_VERSION_STRING} 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( target_link_libraries(
core_test core_test

2
nano/core_test/network.cpp
View file

@ -1014,7 +1014,7 @@ TEST (network, tcp_message_manager)
// This should give sufficient time to execute put_message // This should give sufficient time to execute put_message
// and prove that it waits on condition variable // 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.entries.size (), manager.max_entries);
ASSERT_EQ (manager.get_message ().node_id, item.node_id); ASSERT_EQ (manager.get_message ().node_id, item.node_id);

1
nano/lib/CMakeLists.txt
View file

@ -124,5 +124,4 @@ target_compile_definitions(
-DMINOR_VERSION_STRING=${CPACK_PACKAGE_VERSION_MINOR} -DMINOR_VERSION_STRING=${CPACK_PACKAGE_VERSION_MINOR}
-DPATCH_VERSION_STRING=${CPACK_PACKAGE_VERSION_PATCH} -DPATCH_VERSION_STRING=${CPACK_PACKAGE_VERSION_PATCH}
-DPRE_RELEASE_VERSION_STRING=${CPACK_PACKAGE_VERSION_PRE_RELEASE} -DPRE_RELEASE_VERSION_STRING=${CPACK_PACKAGE_VERSION_PRE_RELEASE}
-DCI=${CI_TEST}
PUBLIC -DACTIVE_NETWORK=${ACTIVE_NETWORK}) PUBLIC -DACTIVE_NETWORK=${ACTIVE_NETWORK})