Remove CI_TEST
option
This commit is contained in:
parent
a802590634
commit
3b775c5a49
7 changed files with 2 additions and 10 deletions
|
@ -34,10 +34,6 @@ if(COVERAGE)
|
|||
include(CoverageTest)
|
||||
endif()
|
||||
|
||||
set(CI_TEST
|
||||
0
|
||||
CACHE STRING "")
|
||||
|
||||
if(MSVC)
|
||||
add_definitions(/MP)
|
||||
endif()
|
||||
|
|
|
@ -31,7 +31,6 @@ else {
|
|||
}
|
||||
$env:NETWORK_CFG = "dev"
|
||||
$env:NANO_TEST = "-DNANO_TEST=ON"
|
||||
$env:CI = '-DCI_TEST="1"'
|
||||
$env:RUN = "test"
|
||||
}
|
||||
|
||||
|
|
|
@ -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:-} \
|
||||
..
|
||||
|
|
|
@ -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:-} \
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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})
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue