Merge pull request #264 from PJK/b32ci

Set up a 32b cross-compile CI environment

.circleci/config.yml

@@ -4,7 +4,7 @@ commands:
   linux-setup:
     steps:
     - run: sudo apt-get update
-    - run: sudo apt-get install -y cmake "${TOOLCHAIN_PACKAGE}"
+    - run: sudo apt-get install -y cmake ${TOOLCHAIN_PACKAGES}
     - run: sudo apt install libcmocka-dev
   build:
     steps:
@@ -34,7 +34,7 @@ jobs:
     machine:
       image: ubuntu-2204:2022.10.2
     environment:
-      TOOLCHAIN_PACKAGE: g++
+      TOOLCHAIN_PACKAGES: g++
     steps:
       - checkout
       - linux-setup
@@ -57,7 +57,7 @@ jobs:
     machine:
       image: ubuntu-2204:2022.10.2
     environment:
-      TOOLCHAIN_PACKAGE: g++
+      TOOLCHAIN_PACKAGES: g++
       CMAKE_COVERAGE: ON
     steps:
       - checkout
@@ -78,7 +78,7 @@ jobs:
     machine:
       image: ubuntu-2204:2022.10.2
     environment:
-      TOOLCHAIN_PACKAGE: clang
+      TOOLCHAIN_PACKAGES: clang
       CC: clang
       CXX: clang++
     steps:
@@ -87,11 +87,34 @@ jobs:
       - build
       - test
 
+  build-and-test-32b:
+    machine:
+      image: ubuntu-2204:2022.10.2
+    steps:
+      - checkout
+      - run: sudo apt-get update
+      - run: sudo apt-get install -y cmake gcc-multilib g++-multilib libc6-dev-i386
+      # Make cmocka from source w/ 32b setup
+      - run: git clone https://git.cryptomilk.org/projects/cmocka.git ~/cmocka
+      - run: >
+          cd $(mktemp -d /tmp/build.XXXX) &&
+          cmake ~/cmocka -DCMAKE_TOOLCHAIN_FILE=~/cmocka/cmake/Toolchain-cross-m32.cmake &&
+          make &&
+          sudo make install
+      # Piggyback on the cmocka 32b toolchain
+      - run: >
+          cmake -DWITH_TESTS=ON \
+            -DCMAKE_BUILD_TYPE=Debug \
+            -DCMAKE_TOOLCHAIN_FILE=~/cmocka/cmake/Toolchain-cross-m32.cmake \
+            .
+      - run: make -j 16 VERBOSE=1
+      - test
+
   build-and-test-release-clang:
     machine:
       image: ubuntu-2204:2022.10.2
     environment:
-      TOOLCHAIN_PACKAGE: clang
+      TOOLCHAIN_PACKAGES: clang
       CC: clang
       CXX: clang++
     steps:
@@ -104,7 +127,7 @@ jobs:
     machine:
       image: ubuntu-2204:2022.10.2
     environment:
-      TOOLCHAIN_PACKAGE: clang
+      TOOLCHAIN_PACKAGES: clang
       CC: clang
       CXX: clang++
       CMAKE_COVERAGE: ON
@@ -119,7 +142,7 @@ jobs:
     machine:
       image: ubuntu-2204:2022.10.2
     environment:
-      TOOLCHAIN_PACKAGE: g++
+      TOOLCHAIN_PACKAGES: g++
     resource_class: arm.medium
     steps:
       - checkout
@@ -131,7 +154,7 @@ jobs:
     machine:
       image: ubuntu-2204:2022.10.2
     environment:
-      TOOLCHAIN_PACKAGE: g++
+      TOOLCHAIN_PACKAGES: g++
     steps:
       - checkout
       - linux-setup
@@ -162,6 +185,7 @@ workflows:
       - static-test
       - build-and-test
       - build-and-test-clang
+      - build-and-test-32b
       - build-and-test-release-clang
       - build-and-test-arm
       - build-bazel

CMakeModules/FindCMocka.cmake

@@ -21,14 +21,22 @@
 #=============================================================================
 #
 
+find_package(PkgConfig QUIET)
+if(PKG_CONFIG_FOUND)
+    pkg_check_modules(PC_CMOCKA QUIET cmocka)
+    set(CMOCKA_DEFINITIONS ${PC_CMOCKA_CFLAGS_OTHER})
+endif()
+
 find_path(CMOCKA_INCLUDE_DIR
+    HINTS ${PC_CMOCKA_INCLUDEDIR} ${PC_CMOCKA_INCLUDE_DIRS}
     NAMES
         cmocka.h
     PATHS
         ${CMOCKA_ROOT_DIR}/include
 )
 
 find_library(CMOCKA_LIBRARY
+    HINTS ${PC_CMOCKA_LIBDIR} ${PC_CMOCKA_LIBRARY_DIRS}
     NAMES
         cmocka cmocka_shared
     PATHS

test/array_encoders_test.c

@@ -8,6 +8,7 @@
 #include <setjmp.h>
 #include <stdarg.h>
 #include <stddef.h>
+#include <stdint.h>
 
 #include <cmocka.h>
 

test/array_test.c

@@ -8,6 +8,7 @@
 #include <setjmp.h>
 #include <stdarg.h>
 #include <stddef.h>
+#include <stdint.h>
 
 #include <cmocka.h>
 

test/assertions.h

@@ -1,6 +1,7 @@
 #include <setjmp.h>
 #include <stdarg.h>
 #include <stddef.h>
+#include <stdint.h>
 
 #include <cmocka.h>
 

test/bad_inputs_test.c

@@ -8,6 +8,7 @@
 #include <setjmp.h>
 #include <stdarg.h>
 #include <stddef.h>
+#include <stdint.h>
 
 #include <cmocka.h>
 

test/bytestring_encoders_test.c

@@ -8,6 +8,7 @@
 #include <setjmp.h>
 #include <stdarg.h>
 #include <stddef.h>
+#include <stdint.h>
 
 #include <cmocka.h>
 

test/bytestring_test.c

@@ -8,6 +8,7 @@
 #include <setjmp.h>
 #include <stdarg.h>
 #include <stddef.h>
+#include <stdint.h>
 
 #include <cmocka.h>
 

test/callbacks_test.c

@@ -7,6 +7,7 @@
 #include <setjmp.h>
 #include <stdarg.h>
 #include <stddef.h>
+#include <stdint.h>
 
 #include <cmocka.h>
 

test/cbor_serialize_test.c

@@ -13,6 +13,7 @@
 #include <setjmp.h>
 #include <stdarg.h>
 #include <stddef.h>
+#include <stdint.h>
 #include <string.h>
 #include <strings.h>
 

test/cbor_stream_decode_test.c

@@ -8,6 +8,7 @@
 #include <setjmp.h>
 #include <stdarg.h>
 #include <stddef.h>
+#include <stdint.h>
 
 #include <cmocka.h>
 

test/copy_test.c

@@ -8,6 +8,7 @@
 #include <setjmp.h>
 #include <stdarg.h>
 #include <stddef.h>
+#include <stdint.h>
 
 #include <cmocka.h>
 

test/float_ctrl_encoders_test.c

@@ -8,6 +8,7 @@
 #include <setjmp.h>
 #include <stdarg.h>
 #include <stddef.h>
+#include <stdint.h>
 
 #include <cmocka.h>
 

test/float_ctrl_test.c

@@ -9,6 +9,7 @@
 #include <setjmp.h>
 #include <stdarg.h>
 #include <stddef.h>
+#include <stdint.h>
 #include <tgmath.h>
 
 #include <cmocka.h>

test/fuzz_test.c

@@ -8,6 +8,7 @@
 #include <setjmp.h>
 #include <stdarg.h>
 #include <stddef.h>
+#include <stdint.h>
 
 #include <cmocka.h>
 

test/map_encoders_test.c

@@ -8,6 +8,7 @@
 #include <setjmp.h>
 #include <stdarg.h>
 #include <stddef.h>
+#include <stdint.h>
 
 #include <cmocka.h>
 

test/map_test.c

@@ -8,6 +8,7 @@
 #include <setjmp.h>
 #include <stdarg.h>
 #include <stddef.h>
+#include <stdint.h>
 #include <string.h>
 
 #include <cmocka.h>

test/memory_utils_test.c

@@ -8,6 +8,7 @@
 #include <setjmp.h>
 #include <stdarg.h>
 #include <stddef.h>
+#include <stdint.h>
 
 #include <cmocka.h>
 

test/negint_encoders_test.c

@@ -8,6 +8,7 @@
 #include <setjmp.h>
 #include <stdarg.h>
 #include <stddef.h>
+#include <stdint.h>
 
 #include <cmocka.h>
 

test/negint_test.c

@@ -8,6 +8,7 @@
 #include <setjmp.h>
 #include <stdarg.h>
 #include <stddef.h>
+#include <stdint.h>
 
 #include <cmocka.h>
 #include "test_allocator.h"

test/pretty_printer_test.c

@@ -8,6 +8,7 @@
 #include <setjmp.h>
 #include <stdarg.h>
 #include <stddef.h>
+#include <stdint.h>
 
 #include <cmocka.h>
 

test/stack_over_limit_test.c

@@ -1,6 +1,7 @@
 #include <setjmp.h>
 #include <stdarg.h>
 #include <stddef.h>
+#include <stdint.h>
 
 #include <cmocka.h>
 

test/string_encoders_test.c

@@ -8,6 +8,7 @@
 #include <setjmp.h>
 #include <stdarg.h>
 #include <stddef.h>
+#include <stdint.h>
 
 #include <cmocka.h>
 

test/string_test.c

@@ -8,6 +8,7 @@
 #include <setjmp.h>
 #include <stdarg.h>
 #include <stddef.h>
+#include <stdint.h>
 
 #include <cmocka.h>
 

test/tag_encoders_test.c

@@ -8,6 +8,7 @@
 #include <setjmp.h>
 #include <stdarg.h>
 #include <stddef.h>
+#include <stdint.h>
 
 #include <cmocka.h>
 

test/tag_test.c

@@ -8,6 +8,7 @@
 #include <setjmp.h>
 #include <stdarg.h>
 #include <stddef.h>
+#include <stdint.h>
 
 #include <cmocka.h>
 

test/test_allocator.h

@@ -4,6 +4,7 @@
 #include <setjmp.h>
 #include <stdarg.h>
 #include <stddef.h>
+#include <stdint.h>
 
 #include <cmocka.h>
 

test/uint_encoders_test.c

@@ -8,6 +8,7 @@
 #include <setjmp.h>
 #include <stdarg.h>
 #include <stddef.h>
+#include <stdint.h>
 
 #include <cmocka.h>
 

test/uint_test.c

@@ -8,6 +8,7 @@
 #include <setjmp.h>
 #include <stdarg.h>
 #include <stddef.h>
+#include <stdint.h>
 
 #include <cmocka.h>
 #include "test_allocator.h"

test/unicode_test.c

@@ -8,6 +8,7 @@
 #include <setjmp.h>
 #include <stdarg.h>
 #include <stddef.h>
+#include <stdint.h>
 
 #include <cmocka.h>