From a4501384bf67360e2aee345c4ffe3819d4bbcb37 Mon Sep 17 00:00:00 2001 From: Jacob Torrey Date: Mon, 22 Aug 2016 18:41:17 -0600 Subject: Disable core_tests on Travis-CI Signed-off-by: Jacob Torrey --- tests/CMakeLists.txt | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) (limited to 'tests') diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index d1be97afc..03b8b169d 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -54,7 +54,10 @@ else () endif() endif () -add_subdirectory(core_tests) +# Skip the core_tests if we are running in Travis-CI because they will take too long +if (NOT DEFINED ENV{TRAVIS}) + add_subdirectory(core_tests) +endif () add_subdirectory(crypto) add_subdirectory(functional_tests) add_subdirectory(performance_tests) @@ -86,5 +89,11 @@ add_test( NAME hash-target COMMAND hash-target-tests) -add_custom_target(tests DEPENDS coretests difficulty hash performance_tests core_proxy unit_tests) +# Skip the core_tests if we are running in Travis-CI because they will take too long +if (DEFINED ENV{TRAVIS}) + add_custom_target(tests DEPENDS difficulty hash performance_tests core_proxy unit_tests) +else () + add_custom_target(tests DEPENDS coretests difficulty hash performance_tests core_proxy unit_tests) +endif () + set_property(TARGET gtest gtest_main hash-target-tests tests PROPERTY FOLDER "tests") -- cgit v1.2.3 From 65041fbbf86c02d44f0824cf9b49329629438ab5 Mon Sep 17 00:00:00 2001 From: Jacob Torrey Date: Mon, 22 Aug 2016 20:17:57 -0600 Subject: Disabled libwallet_api_test until Issue #895 resolved Signed-off-by: Jacob Torrey --- tests/CMakeLists.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'tests') diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 03b8b169d..c7279e358 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -66,7 +66,9 @@ add_subdirectory(unit_tests) add_subdirectory(difficulty) add_subdirectory(hash) 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) -- cgit v1.2.3 From f017fecde96d1370f99cdab41a65c109bd9682f8 Mon Sep 17 00:00:00 2001 From: Jacob Torrey Date: Sat, 27 Aug 2016 06:22:57 -0600 Subject: Build the core_tests under Travis --- tests/CMakeLists.txt | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'tests') diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index c7279e358..daaa078db 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -54,10 +54,7 @@ else () endif() endif () -# Skip the core_tests if we are running in Travis-CI because they will take too long -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) -- cgit v1.2.3