Merge pull request #1435 from NickeZ/nickez/fix-macos-unit-tests

build: osx support in build builds

Author: NickeZ

CMakeLists.txt

@@ -44,6 +44,10 @@ elseif(CCACHE_PROGRAM)
   set(CMAKE_C_COMPILER_LAUNCHER "${CCACHE_PROGRAM}")
 endif()
 
+# This is ignored on platforms other than darwin. By default rust compiles for
+# 10.7 which doesn't link for us.
+set(CMAKE_OSX_DEPLOYMENT_TARGET "10.15" CACHE STRING "Minimum OS X deployment version")
+
 project(bitbox02 C)
 
 # nosys is set in arm.cmake so that `project(c)` above works. Remove it since it interferes with compile options

cmake/modules/FindCMocka.cmake

@@ -32,6 +32,9 @@ set(LIBWALLY_CFLAGS  "\
   -D_DEFAULT_SOURCE \
   -fno-strict-aliasing \
 ")
+if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+  string(APPEND LIBWALLY_CFLAGS " -mmacosx-version-min=${CMAKE_OSX_DEPLOYMENT_TARGET}")
+endif()
 
 # Hide some warnings
 set(LIBWALLY_CFLAGS "${LIBWALLY_CFLAGS} -Wno-cast-qual -Wno-cast-align \

external/CMakeLists.txt

@@ -285,7 +285,7 @@ get_property(SECP256k1_INCLUDES TARGET secp256k1 PROPERTY INTERFACE_INCLUDE_DIRE
 foreach(include ${INCLUDES} ${SAMD51A_INCLUDES} ${ASF4_INCLUDES} ${ASF4_MIN_INCLUDES} ${CMSIS_INCLUDES} ${WALLY_INCLUDES} ${SECP256k1_INCLUDES})
   list(APPEND RUST_INCLUDES -I${include})
 endforeach()
-if(NOT CMAKE_CROSSCOMPILING)
+if(NOT (CMAKE_CROSSCOMPILING AND NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin"))
   list(APPEND RUST_INCLUDES -I${CMAKE_SOURCE_DIR}/test/unit-test/framework/includes)
 endif()
 
@@ -305,7 +305,10 @@ if(NOT CMAKE_CROSSCOMPILING)
         ${CARGO} test $<$<BOOL:${CMAKE_VERBOSE_MAKEFILE}>:-v> --all-features --target-dir ${RUST_BINARY_DIR}/all-features ${RUST_CARGO_FLAGS} -- --nocapture --test-threads 1
     WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/rust/
     )
-  add_dependencies(rust-test bitbox_merged generate-protobufs)
+  add_dependencies(rust-test generate-protobufs)
+  if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+    add_dependencies(rust-test bitbox_merged)
+  endif()
 
   add_custom_target(rust-clippy
     COMMAND

src/CMakeLists.txt

@@ -179,10 +179,10 @@ add_executable(simulator simulator.c framework/eh_personality.c)
 target_link_libraries(simulator PRIVATE
   $<$<BOOL:${SANITIZE_ADDRESS}>:asan>
   $<$<BOOL:${SANITIZE_UNDEFINED}>:-fsanitize=undefined>
-  -Wl,--start-group
+  $<$<NOT:$<PLATFORM_ID:Darwin>>:-Wl,--start-group>
   c-unit-tests_rust_c
   bitbox-simulator
-  -Wl,--end-group
+  $<$<NOT:$<PLATFORM_ID:Darwin>>:-Wl,--end-group>
   ""
 )
 

test/simulator/CMakeLists.txt

@@ -12,6 +12,24 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+# No linker for Mach-O supports the linker argument `--wrap`. Since we use
+# that, unit tests will never work on macos. Use linux/arm64 in docker instead.
+if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+    message("No linker for Mach-O supports --wrap, will not generate unit-tests")
+    return()
+endif()
+
+# We use FindPkgConfig instead of FindPackage because it finds libraries in
+# both linux and macos
+find_package(PkgConfig REQUIRED)
+
+# Unit testing uses CMocka
+pkg_check_modules(CMOCKA REQUIRED cmocka)
+# u2f tests with hardware uses hidapi-hidraw
+pkg_check_modules(HIDAPI REQUIRED hidapi-hidraw)
+
+message("hidapi-hidraw " ${HIDAPI_INCLUDE_DIRS})
+
 
 #-----------------------------------------------------------------------------
 # Build bitbox lib to use in tests
@@ -115,6 +133,7 @@ target_include_directories(
   ${CMAKE_CURRENT_SOURCE_DIR}/framework/includes
   ${CMAKE_CURRENT_SOURCE_DIR}
   ${CMAKE_BINARY_DIR}/src
+  ${CMOCKA_INCLUDE_DIRS}
 )
 
 target_include_directories(
@@ -160,6 +179,7 @@ target_compile_definitions(bitbox PUBLIC TESTING _UNIT_TEST_)
 target_link_libraries(bitbox
   PUBLIC
     secp256k1
+    ${CMOCKA_LIBRARIES}
   PRIVATE
     wallycore
     ctaes
@@ -192,6 +212,7 @@ target_include_directories(
   u2f-util
   SYSTEM PUBLIC
   ${CMAKE_CURRENT_SOURCE_DIR}
+  ${HIDAPI_INCLUDE_DIRS}
 )
 target_include_directories(
   u2f-util
@@ -202,6 +223,8 @@ target_include_directories(
 target_compile_definitions(u2f-util PUBLIC "TESTING" _UNIT_TEST_ PRODUCT_BITBOX_MULTI "APP_U2F=1" "APP_BTC=1" "APP_LTC=1" "APP_ETH=1")
 target_compile_definitions(u2f-util PUBLIC "USE_KECCAK")
 
+target_link_libraries(u2f-util PUBLIC ${HIDAPI_LIBRARIES})
+
 
 #-----------------------------------------------------------------------------
 # Tests
@@ -239,8 +262,6 @@ set(TEST_LIST
    ""
 )
 
-find_package(CMocka REQUIRED)
-
 list(LENGTH TEST_LIST TEST_LIST_LEN)
 math(EXPR TEST_LIST_LEN ${TEST_LIST_LEN}-1)
 foreach(I RANGE 0 ${TEST_LIST_LEN} 2)
@@ -257,7 +278,6 @@ foreach(I RANGE 0 ${TEST_LIST_LEN} 2)
     c-unit-tests_rust_c
     bitbox
     -Wl,--end-group
-    ${CMOCKA_LIBRARIES}
     ${TEST_LINK_ARGS}
   )
   if(NOT ${TEST_NAME} STREQUAL "simulator")
@@ -286,7 +306,6 @@ foreach(TEST_NAME ${U2F_TESTS})
     bitbox
     -Wl,--end-group
     u2f-util
-    ${CMOCKA_LIBRARIES}
   )
   target_compile_definitions(${EXE} PRIVATE "TESTING")
   add_test(NAME test_${TEST_NAME} COMMAND ${EXE})
@@ -299,8 +318,6 @@ foreach(TEST_NAME ${U2F_TESTS})
     $<$<BOOL:${SANITIZE_ADDRESS}>:asan>
     $<$<BOOL:${SANITIZE_UNDEFINED}>:-fsanitize=undefined>
     u2f-util
-    hidapi-hidraw
-    ${CMOCKA_LIBRARIES}
   )
   target_compile_definitions(${EXE} PRIVATE "TESTING" "WITH_HARDWARE")
 endforeach()

test/unit-test/CMakeLists.txt

@@ -20,7 +20,7 @@
 #include "usb/usb_frame.h"
 
 #ifndef CONTINUOUS_INTEGRATION
-#include <hidapi/hidapi.h>
+#include <hidapi.h>
 #else
 typedef void hid_device;
 #endif