Skip to content

Utils offload #527

New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/workflows/compile-examples.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ jobs:
- name: Arduino_DebugUtils
- name: ArduinoMqttClient
- name: Arduino_SecureElement
- name: Arduino_CloudUtils
# sketch paths to compile (recursive) for all boards
UNIVERSAL_SKETCH_PATHS: |
- examples/ArduinoIoTCloud-Advanced
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/unit-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ jobs:
coverage-exclude-paths: |
- '*/extras/test/*'
- '/usr/*'
- '*/src/cbor/lib/*'
coverage-data-path: ${{ env.COVERAGE_DATA_PATH }}

# A token is used to avoid intermittent spurious job failures caused by rate limiting.
Expand Down
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -20,5 +20,7 @@ CTestTestfile.cmake
_deps

### CMake Patch ###
CMakeUserPresets.json

# External projects
*-prefix/
Empty file added .gitmodules
Empty file.
58 changes: 42 additions & 16 deletions extras/test/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -14,16 +14,42 @@ FetchContent_Declare(
GIT_TAG v3.4.0
)

FetchContent_Declare(
cloudutils
GIT_REPOSITORY https://github.com/arduino-libraries/Arduino_CloudUtils.git
GIT_TAG main
)

FetchContent_MakeAvailable(Catch2)

FetchContent_MakeAvailable(cloudutils)
##########################################################################

include_directories(include)
include_directories(../../src)
include_directories(../../src/message)
include_directories(../../src/cbor)
include_directories(../../src/property)
include_directories(../../src/utility/time)

# add_library(cloudutils STATIC IMPORTED GLOBAL)
add_library(cloudutils INTERFACE)

target_include_directories(
cloudutils INTERFACE
${cloudutils_SOURCE_DIR}/src/
)

target_include_directories(
cloudutils INTERFACE
${cloudutils_SOURCE_DIR}/src/cbor
)

target_include_directories(
cloudutils INTERFACE
${cloudutils_SOURCE_DIR}/src/interfaces
)

##########################################################################

set(CMAKE_CXX_STANDARD 11)
Expand Down Expand Up @@ -53,7 +79,6 @@ set(TEST_SRCS
src/test_writeOnly.cpp
src/test_writeOnDemand.cpp
src/test_writeOnChange.cpp
src/test_TimedAttempt.cpp
)

set(TEST_UTIL_SRCS
Expand All @@ -62,26 +87,26 @@ set(TEST_UTIL_SRCS
)

set(TEST_DUT_SRCS
../../src/utility/time/TimedAttempt.cpp
../../src/property/Property.cpp
../../src/property/PropertyContainer.cpp
../../src/cbor/CBORDecoder.cpp
../../src/cbor/CBOREncoder.cpp
../../src/cbor/MessageDecoder.cpp
../../src/cbor/MessageEncoder.cpp
../../src/cbor/CBOR.cpp
../../src/cbor/lib/tinycbor/src/cborencoder.c
../../src/cbor/lib/tinycbor/src/cborencoder_close_container_checked.c
../../src/cbor/lib/tinycbor/src/cborerrorstrings.c
../../src/cbor/lib/tinycbor/src/cborparser.c
../../src/cbor/lib/tinycbor/src/cborparser_dup_string.c
../../src/cbor/lib/tinycbor/src/cborpretty.c
../../src/cbor/lib/tinycbor/src/cborpretty_stdio.c
../../src/cbor/lib/tinycbor/src/cbortojson.c
../../src/cbor/lib/tinycbor/src/cborvalidation.c
../../src/cbor/lib/tinycbor/src/open_memstream.c
../../src/cbor/IoTCloudMessageDecoder.cpp
../../src/cbor/IoTCloudMessageEncoder.cpp

${cloudutils_SOURCE_DIR}/src/cbor/tinycbor/src/cborencoder.c
${cloudutils_SOURCE_DIR}/src/cbor/tinycbor/src/cborencoder_close_container_checked.c
${cloudutils_SOURCE_DIR}/src/cbor/tinycbor/src/cborerrorstrings.c
${cloudutils_SOURCE_DIR}/src/cbor/tinycbor/src/cborparser.c
${cloudutils_SOURCE_DIR}/src/cbor/tinycbor/src/cborparser_dup_string.c
${cloudutils_SOURCE_DIR}/src/cbor/tinycbor/src/cborpretty.c
${cloudutils_SOURCE_DIR}/src/cbor/tinycbor/src/cborpretty_stdio.c
${cloudutils_SOURCE_DIR}/src/cbor/tinycbor/src/cbortojson.c
${cloudutils_SOURCE_DIR}/src/cbor/tinycbor/src/cborvalidation.c
${cloudutils_SOURCE_DIR}/src/cbor/tinycbor/src/open_memstream.c
${cloudutils_SOURCE_DIR}/src/cbor/MessageDecoder.cpp
${cloudutils_SOURCE_DIR}/src/cbor/MessageEncoder.cpp
)

##########################################################################

set(TEST_TARGET_SRCS
Expand All @@ -108,6 +133,7 @@ add_executable(
${TEST_TARGET_SRCS}
)

target_link_libraries( ${TEST_TARGET} cloudutils)
target_link_libraries( ${TEST_TARGET} Catch2WithMain )

##########################################################################
Expand Down
186 changes: 0 additions & 186 deletions extras/test/src/test_TimedAttempt.cpp

This file was deleted.

Loading
Loading