diff options
| author | Riccardo Spagni <ric@spagni.net> | 2016-09-01 20:01:16 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2016-09-01 20:01:16 +0200 |
| commit | 59b7f51766d2a50de3efefc343a7b95deb0ffc34 (patch) | |
| tree | 77a91c541aee148b3aa780f58dcda1a44ce6fc18 /tests/CMakeLists.txt | |
| parent | Merge pull request #1029 (diff) | |
| parent | cmake: exclude tests from running (diff) | |
| download | monero-59b7f51766d2a50de3efefc343a7b95deb0ffc34.tar.xz | |
Merge pull request #1010
3398515 cmake: exclude tests from running (redfish)
e374ae7 cmake: option+target for profiling for coverage (redfish)
Diffstat (limited to 'tests/CMakeLists.txt')
| -rw-r--r-- | tests/CMakeLists.txt | 14 |
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}") |