Skip to content
New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

tests: fix workflow errors #30

Merged
merged 4 commits into from
Oct 28, 2023
Merged

tests: fix workflow errors #30

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7c3b9b9
version: define MENDER_CLIENT_VERSION
joelguittet Oct 28, 2023
10c222a
tests: add missing IDF_VER definition
joelguittet Oct 28, 2023
e131f94
tests: add missing mock definition
joelguittet Oct 28, 2023
afeb392
tests: add missing mock version
joelguittet Oct 28, 2023
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 .clang-format-ignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ tests/mocks/zephyr/include/zephyr/sys/time_units.h
tests/mocks/zephyr/include/zephyr/sys/util.h
tests/mocks/zephyr/include/zephyr/sys/util_macro.h
tests/mocks/zephyr/include/zephyr/sys_clock.h
tests/mocks/zephyr/include/version.h
tests/mocks/zephyr/src/device.c
tests/mocks/zephyr/src/flash.c
tests/mocks/zephyr/src/flash_img.c
Expand Down
4 changes: 4 additions & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,5 +42,9 @@ include_directories(${CMAKE_CURRENT_LIST_DIR}/platform/net/${CONFIG_MENDER_MCU_C
include_directories(${CMAKE_CURRENT_LIST_DIR}/platform/rtos/${CONFIG_MENDER_MCU_CLIENT_RTOS_TYPE}/include)
include_directories(${CMAKE_CURRENT_LIST_DIR}/platform/tls/${CONFIG_MENDER_MCU_CLIENT_TLS_TYPE}/include)

# Define version
file(STRINGS "${CMAKE_CURRENT_LIST_DIR}/VERSION" MENDER_CLIENT_VERSION)
add_definitions("-DMENDER_CLIENT_VERSION=\"${MENDER_CLIENT_VERSION}\"")

# Creation of the library
add_library(mender-mcu-client STATIC ${SOURCES_TEMP})
3 changes: 3 additions & 0 deletions tests/mocks/esp-idf/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,3 +29,6 @@ target_sources(${APP_EXECUTABLE_NAME} PRIVATE ${SOURCES_TEMP})

# Add include directories
include_directories("${CMAKE_CURRENT_LIST_DIR}/include")

# Define esp-idf version
add_definitions("-DIDF_VER=\"x.y.z\"")
6 changes: 6 additions & 0 deletions tests/mocks/zephyr/include/version.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
#ifndef __VERSION_H__
#define __VERSION_H__

#define KERNEL_VERSION_STRING "x.y.z"

#endif /* __VERSION_H__ */
1 change: 1 addition & 0 deletions tests/mocks/zephyr/include/zephyr/net/socket.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
#define SOL_TLS 282
#define TLS_SEC_TAG_LIST 1
#define TLS_HOSTNAME 2
#define TLS_PEER_VERIFY 5

struct addrinfo {
int ai_family;
Expand Down