4rkal/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-12-14 04:16:32 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

cmake: exclude tests from running

Browse Source 
Minimize special cases in cmake script, likely to be forgotten.
This commit is contained in:
redfish 2016-08-29 15:37:40 -04:00
parent e374ae7eeb
commit 3398515dd4
2 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.travis.yml
View File

@ -36,6 +36,9 @@ matrix:
- pip install --user cpp-coveralls - pip install --user cpp-coveralls
install: install:
- sudo apt-get -y install libboost-{chrono,program-options,date-time,thread,system,filesystem,regex,serialization}1.58{-dev,.0} - sudo apt-get -y install libboost-{chrono,program-options,date-time,thread,system,filesystem,regex,serialization}1.58{-dev,.0}
env:
# exclude long-running and failing tests (#895)
- ARGS=" -E 'coretests|libwallet_api_tests' "
script: script:
- make -j2 coverage - make -j2 coverage
after_success: after_success:

12
tests/CMakeLists.txt
View File

@ -62,9 +62,7 @@ else ()
FOLDER "${folder}") FOLDER "${folder}")
endif () endif ()
if (NOT DEFINED ENV{TRAVIS})
add_subdirectory(core_tests) add_subdirectory(core_tests)
endif ()
add_subdirectory(crypto) add_subdirectory(crypto)
add_subdirectory(functional_tests) add_subdirectory(functional_tests)
add_subdirectory(performance_tests) add_subdirectory(performance_tests)
@ -73,9 +71,7 @@ add_subdirectory(unit_tests)
add_subdirectory(difficulty) add_subdirectory(difficulty)
add_subdirectory(hash) add_subdirectory(hash)
add_subdirectory(net_load_tests) add_subdirectory(net_load_tests)
add_subdirectory(libwallet_api_tests)
# Disabled until issue #895 is resolved
#add_subdirectory(libwallet_api_tests)
# add_subdirectory(daemon_tests) # add_subdirectory(daemon_tests)
@ -99,16 +95,12 @@ add_test(
COMMAND hash-target-tests) COMMAND hash-target-tests)
set(enabled_tests set(enabled_tests
coretests
difficulty difficulty
hash hash
performance_tests performance_tests
core_proxy core_proxy
unit_tests) unit_tests)
# Skip the core_tests in Travis-CI because they will take too long
if (NOT DEFINED ENV{TRAVIS})
list(APPEND enabled_tests coretests)
endif()
add_custom_target(tests DEPENDS enabled_tests) add_custom_target(tests DEPENDS enabled_tests)
set_property(TARGET tests PROPERTY FOLDER "${folder}") set_property(TARGET tests PROPERTY FOLDER "${folder}")