aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacob Torrey <discipleofranok@gmail.com>2016-08-22 18:41:17 -0600
committerJacob Torrey <torreyj@ainfosec.com>2016-08-26 14:03:27 -0600
commita4501384bf67360e2aee345c4ffe3819d4bbcb37 (patch)
tree448648d914cf674139e0788d83f1c46834163c97
parentAdded -j2 to Makefile and clean up matrix (diff)
downloadmonero-a4501384bf67360e2aee345c4ffe3819d4bbcb37.tar.xz
Disable core_tests on Travis-CI
Signed-off-by: Jacob Torrey <discipleofranok@gmail.com>
Diffstat (limited to '')
-rw-r--r--tests/CMakeLists.txt13
1 files changed, 11 insertions, 2 deletions
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")