Merge pull request #499 from EOSIO/larryk85-patch-1

Added Integration Tests to Buildkite Pipeline
EOSIO · Jul 9, 2019 · 3f00266 · 3f00266
2 parents 8f3bd68 + 873b673
commit 3f00266
Show file tree

Hide file tree

Showing 6 changed files with 54 additions and 9 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -5,13 +5,11 @@ find_program(SCCACHE_FOUND sccache)
 if (SCCACHE_FOUND)
    message(STATUS "Using sccache")
    set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE sccache)
-   set_property(GLOBAL PROPERTY RULE_LAUNCH_LINK sccache)
 else()
    find_program(CCACHE_FOUND ccache)
    if (CCACHE_FOUND)
       message(STATUS "Using ccache")
       set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE ccache)
-      set_property(GLOBAL PROPERTY RULE_LAUNCH_LINK ccache)
    endif()
 endif()
 

diff --git a/libraries/CMakeLists.txt b/libraries/CMakeLists.txt
@@ -1,5 +1,11 @@
 project(eosio_libraries)
 
+find_program(CCACHE_FOUND ccache)
+if (CCACHE_FOUND)
+    message(STATUS "Using ccache")
+    set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE ccache)
+endif()
+
 list(APPEND CMAKE_MODULE_PATH ${EOSIO_CDT_BIN})
 include(EosioCDTMacros)
 

diff --git a/modules/TestsExternalProject.txt b/modules/TestsExternalProject.txt
@@ -34,7 +34,7 @@ if (EOSIO_RUN_INTEGRATION_TESTS)
         EosioIntegrationTests
         SOURCE_DIR "${CMAKE_SOURCE_DIR}/tests/integration"
         BINARY_DIR "${CMAKE_BINARY_DIR}/tests/integration"
-        CMAKE_ARGS -DCMAKE_BUILD_TYPE=${TEST_BUILD_TYPE} -DCMAKE_FRAMEWORK_PATH=${TEST_FRAMEWORK_PATH} -DCMAKE_MODULE_PATH=${TEST_MODULE_PATH} -DEOSIO_ROOT=${EOSIO_ROOT} -DLLVM_DIR=${LLVM_DIR}
+        CMAKE_ARGS -DCMAKE_BUILD_TYPE=${TEST_BUILD_TYPE} -DCMAKE_FRAMEWORK_PATH=${TEST_FRAMEWORK_PATH} -DCMAKE_MODULE_PATH=${TEST_MODULE_PATH} -DEOSIO_ROOT=${EOSIO_ROOT} -DLLVM_DIR=${LLVM_DIR} -DBOOST_ROOT=${BOOST_ROOT}
         UPDATE_COMMAND ""
         PATCH_COMMAND  ""
         TEST_COMMAND   ""

diff --git a/pipeline.jsonc b/pipeline.jsonc
@@ -0,0 +1,10 @@
+{
+    "eosio-dot-cdt":
+    {
+        "pipeline-branch": "master",
+        "dependencies": // dependencies to pull for cdt integration tests, by branch, tag, or commit hash
+        {
+            "eosio": "release/1.7.x"
+        }
+    }
+}
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
@@ -1,17 +1,43 @@
+find_program(SCCACHE_FOUND sccache)
+if (SCCACHE_FOUND)
+   message(STATUS "Using sccache")
+   set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE sccache)
+else()
+   find_program(CCACHE_FOUND ccache)
+   if (CCACHE_FOUND)
+      message(STATUS "Using ccache")
+      set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE ccache)
+   endif()
+endif()
+
 add_test( asset_tests ${CMAKE_BINARY_DIR}/tests/unit/asset_tests )
+set_property(TEST asset_tests PROPERTY LABELS unit_tests)
 add_test( binary_extension_tests ${CMAKE_BINARY_DIR}/tests/unit/binary_extension_tests )
+set_property(TEST binary_extension_tests PROPERTY LABELS unit_tests)
 add_test( crypto_tests ${CMAKE_BINARY_DIR}/tests/unit/crypto_tests )
+set_property(TEST crypto_tests PROPERTY LABELS unit_tests)
 add_test( datastream_tests ${CMAKE_BINARY_DIR}/tests/unit/datastream_tests )
+set_property(TEST datastream_tests PROPERTY LABELS unit_tests)
 add_test( fixed_bytes_tests ${CMAKE_BINARY_DIR}/tests/unit/fixed_bytes_tests )
+set_property(TEST fixed_bytes_tests PROPERTY LABELS unit_tests)
 add_test( name_tests ${CMAKE_BINARY_DIR}/tests/unit/name_tests )
+set_property(TEST name_tests PROPERTY LABELS unit_tests)
 add_test( rope_tests ${CMAKE_BINARY_DIR}/tests/unit/rope_tests )
+set_property(TEST rope_tests PROPERTY LABELS unit_tests)
 add_test( print_tests ${CMAKE_BINARY_DIR}/tests/unit/print_tests )
+set_property(TEST print_tests PROPERTY LABELS unit_tests)
 add_test( serialize_tests ${CMAKE_BINARY_DIR}/tests/unit/serialize_tests )
+set_property(TEST serialize_tests PROPERTY LABELS unit_tests)
 add_test( symbol_tests ${CMAKE_BINARY_DIR}/tests/unit/symbol_tests )
+set_property(TEST symbol_tests PROPERTY LABELS unit_tests)
 add_test( system_tests ${CMAKE_BINARY_DIR}/tests/unit/system_tests )
+set_property(TEST system_tests PROPERTY LABELS unit_tests)
 add_test( time_tests ${CMAKE_BINARY_DIR}/tests/unit/time_tests )
+set_property(TEST time_tests PROPERTY LABELS unit_tests)
 add_test( varint_tests ${CMAKE_BINARY_DIR}/tests/unit/varint_tests )
+set_property(TEST varint_tests PROPERTY LABELS unit_tests)
 
 if (eosio_FOUND AND EOSIO_RUN_INTEGRATION_TESTS)
    add_test(integration_tests ${CMAKE_BINARY_DIR}/tests/integration/integration_tests)
-endif()
+   set_property(TEST integration_tests PROPERTY LABELS integration_tests)
+endif()
diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
@@ -3,11 +3,16 @@ find_package(LLVM REQUIRED CONFIG)
 message(STATUS "Found LLVM ${LLVM_PACKAGE_VERSION}")
 message(STATUS "Using LLVMConfig.cmake in: ${LLVM_DIR}")
 
-find_program(CCACHE_FOUND ccache)
-if (CCACHE_FOUND)
-   message(STATUS "Using ccache")
-   set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE ccache)
-   set_property(GLOBAL PROPERTY RULE_LAUNCH_LINK ccache)
+find_program(SCCACHE_FOUND sccache)
+if (SCCACHE_FOUND)
+   message(STATUS "Using sccache")
+   set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE sccache)
+else()
+   find_program(CCACHE_FOUND ccache)
+   if (CCACHE_FOUND)
+      message(STATUS "Using ccache")
+      set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE ccache)
+   endif()
 endif()
 
 include_directories(${LLVM_INCLUDE_DIRS})