aboutsummaryrefslogtreecommitdiff
path: root/tests/CMakeLists.txt
diff options
context:
space:
mode:
authorredfish <redfish@galactica.pw>2016-08-29 15:37:40 -0400
committerredfish <redfish@galactica.pw>2016-09-01 11:17:44 -0400
commit3398515dd4b970500dacef6ed8fa69501f05e6dc (patch)
treefa8b002e7c86dd84e5b0f5d9fa25f1412e8c7c1e /tests/CMakeLists.txt
parentcmake: option+target for profiling for coverage (diff)
downloadmonero-3398515dd4b970500dacef6ed8fa69501f05e6dc.tar.xz
cmake: exclude tests from running
Minimize special cases in cmake script, likely to be forgotten.
Diffstat (limited to 'tests/CMakeLists.txt')
-rw-r--r--tests/CMakeLists.txt14
1 files changed, 3 insertions, 11 deletions
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}")