aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.travis.yml3
-rw-r--r--tests/CMakeLists.txt14
2 files changed, 6 insertions, 11 deletions
diff --git a/.travis.yml b/.travis.yml
index 0bc6db6d5..3eb75bea7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -36,6 +36,9 @@ matrix:
- pip install --user cpp-coveralls
install:
- 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:
- make -j2 coverage
after_success:
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 33d6c233d..75e75f258 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -62,9 +62,7 @@ else ()
FOLDER "${folder}")
endif ()
-if (NOT DEFINED ENV{TRAVIS})
- add_subdirectory(core_tests)
-endif ()
+add_subdirectory(core_tests)
add_subdirectory(crypto)
add_subdirectory(functional_tests)
add_subdirectory(performance_tests)
@@ -73,9 +71,7 @@ add_subdirectory(unit_tests)
add_subdirectory(difficulty)
add_subdirectory(hash)
add_subdirectory(net_load_tests)
-
-# Disabled until issue #895 is resolved
-#add_subdirectory(libwallet_api_tests)
+add_subdirectory(libwallet_api_tests)
# add_subdirectory(daemon_tests)
@@ -99,16 +95,12 @@ add_test(
COMMAND hash-target-tests)
set(enabled_tests
+ coretests
difficulty
hash
performance_tests
core_proxy
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)
set_property(TARGET tests PROPERTY FOLDER "${folder}")