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

unstable tests on actions for windows (#2517)

Browse source 
`if (defined(_WIN32) && CI)` to guard from them running
adds CI_TEST to CMakeFiles to define CI=1 if CI_TEST is true
This commit is contained in:
Russel Waters 2020-01-28 09:07:28 -05:00 • committed by GitHub
commit a752debfc7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 17 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.github/workflows/tests.yml vendored
View file

@ -56,7 +56,7 @@ jobs:
- name: Fetch Deps - name: Fetch Deps
run: ci/actions/linux/install_deps.sh run: ci/actions/linux/install_deps.sh
- name: Run Tests - name: Run Tests
run: docker run -v ${PWD}:/workspace nanocurrency/nano-env:clang /bin/bash -c "cd /workspace && RELEASE=0 ASAN=0 TSAN=0 ./ci/build-travis.sh /usr/lib/x86_64-linux-gnu/cmake/Qt5 ${PWD}" run: docker run -v ${PWD}:/workspace nanocurrency/nano-env:clang /bin/bash -c "cd /workspace && ./ci/build-travis.sh /usr/lib/x86_64-linux-gnu/cmake/Qt5 ${PWD}"
windows_test: windows_test:
runs-on: windows-latest runs-on: windows-latest

1
CMakeLists.txt
View file

@ -14,6 +14,7 @@ execute_process(
) )
option (CI_BUILD false) option (CI_BUILD false)
set (CI_TEST 0 CACHE STRING "")
set (CPACK_PACKAGE_VERSION_MAJOR "21") set (CPACK_PACKAGE_VERSION_MAJOR "21")
set (CPACK_PACKAGE_VERSION_MINOR "0") set (CPACK_PACKAGE_VERSION_MINOR "0")

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

@ -25,7 +25,7 @@ if (${env:artifact} -eq 1) {
} }
$env:NETWORK_CFG = "test" $env:NETWORK_CFG = "test"
$env:NANO_TEST = "-DNANO_TEST=ON" $env:NANO_TEST = "-DNANO_TEST=ON"
$env:CI = "-DCI_BUILD=OFF" $env:CI = '-DCI_TEST="1"'
$env:RUN = "test" $env:RUN = "test"
} }

2
ci/build-travis.sh
View file

@ -48,7 +48,6 @@ else
ROCKSDB="" ROCKSDB=""
fi fi
cmake \ cmake \
-G'Unix Makefiles' \ -G'Unix Makefiles' \
-DACTIVE_NETWORK=nano_test_network \ -DACTIVE_NETWORK=nano_test_network \
@ -61,6 +60,7 @@ cmake \
-DCMAKE_VERBOSE_MAKEFILE=ON \ -DCMAKE_VERBOSE_MAKEFILE=ON \
-DBOOST_ROOT=/tmp/boost/ \ -DBOOST_ROOT=/tmp/boost/ \
-DQt5_DIR=${qt_dir} \ -DQt5_DIR=${qt_dir} \
-DCI_TEST="1" \
${SANITIZERS} \ ${SANITIZERS} \
.. ..

4
nano/core_test/CMakeLists.txt
View file

@ -44,5 +44,7 @@ target_compile_definitions(core_test
PRIVATE PRIVATE
-DTAG_VERSION_STRING=${TAG_VERSION_STRING} -DTAG_VERSION_STRING=${TAG_VERSION_STRING}
-DGIT_COMMIT_HASH=${GIT_COMMIT_HASH} -DGIT_COMMIT_HASH=${GIT_COMMIT_HASH}
-DBOOST_PROCESS_SUPPORTED=${BOOST_PROCESS_SUPPORTED}) -DBOOST_PROCESS_SUPPORTED=${BOOST_PROCESS_SUPPORTED}
-DCI=${CI_TEST})
target_link_libraries (core_test node secure gtest libminiupnpc-static Boost::log_setup Boost::log Boost::boost) target_link_libraries (core_test node secure gtest libminiupnpc-static Boost::log_setup Boost::log Boost::boost)

10
nano/core_test/node.cpp
View file

@ -2952,7 +2952,12 @@ TEST (node, epoch_conflict_confirm)
} }
} }
// Test is unstable on github actions for windows, disable if CI detected and windows
#if (defined(_WIN32) && CI)
TEST (node, DISABLED_fork_invalid_block_signature)
#else
TEST (node, fork_invalid_block_signature) TEST (node, fork_invalid_block_signature)
#endif
{ {
nano::system system (2); nano::system system (2);
auto & node1 (*system.nodes[0]); auto & node1 (*system.nodes[0]);
@ -3392,7 +3397,12 @@ TEST (node, dont_write_lock_node)
finished_promise.set_value (); finished_promise.set_value ();
} }
// Test is unstable on github actions for windows, disable if CI detected
#if (defined(_WIN32) && CI)
TEST (node, DISABLED_bidirectional_tcp)
#else
TEST (node, bidirectional_tcp) TEST (node, bidirectional_tcp)
#endif
{ {
nano::system system; nano::system system;
nano::node_flags node_flags; nano::node_flags node_flags;