From 5a1ecc3958f4412073a22e8b23f4d9f83e442dc0 Mon Sep 17 00:00:00 2001
From: Florian Albrechtskirchinger <falbrechtskirchinger@gmail.com>
Date: Fri, 7 Mar 2025 03:17:41 +0100
Subject: [PATCH] Run 32-bit compiled unit tests on Ubuntu (#2095)
---
.github/workflows/test.yaml | 21 ++++++++++++++++++---
test/Makefile | 4 +++-
2 files changed, 21 insertions(+), 4 deletions(-)
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index 8935f81..02f46be 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -47,15 +47,30 @@ jobs:
(github.event_name == 'pull_request' &&
github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name) ||
(github.event_name == 'workflow_dispatch' && github.event.inputs.test_linux == 'true')
+ strategy:
+ matrix:
+ config:
+ - arch_flags: -m32
+ arch_suffix: :i386
+ name: (32-bit)
+ - arch_flags:
+ arch_suffix:
+ name: (64-bit)
+ name: ubuntu ${{ matrix.config.name }}
steps:
- name: checkout
uses: actions/checkout@v4
- name: install libraries
- run: sudo apt-get update && sudo apt-get install -y libbrotli-dev libcurl4-openssl-dev
+ run: |
+ sudo dpkg --add-architecture i386
+ sudo apt-get update
+ sudo apt-get install -y libc6-dev${{ matrix.config.arch_suffix }} libstdc++-13-dev${{ matrix.config.arch_suffix }} \
+ libssl-dev${{ matrix.config.arch_suffix }} libcurl4-openssl-dev${{ matrix.config.arch_suffix }} \
+ zlib1g-dev${{ matrix.config.arch_suffix }} libbrotli-dev${{ matrix.config.arch_suffix }}
- name: build and run tests
- run: cd test && make
+ run: cd test && make EXTRA_CXXFLAGS="${{ matrix.config.arch_flags }}"
- name: run fuzz test target
- run: cd test && make fuzz_test
+ run: cd test && make EXTRA_CXXFLAGS="${{ matrix.config.arch_flags }}" fuzz_test
macos:
runs-on: macos-latest
diff --git a/test/Makefile b/test/Makefile
index 8b061b4..46c4a91 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -1,5 +1,5 @@
CXX = clang++
-CXXFLAGS = -g -std=c++11 -I. -Wall -Wextra -Wtype-limits -Wconversion -Wshadow # -fno-exceptions -DCPPHTTPLIB_NO_EXCEPTIONS -fsanitize=address
+CXXFLAGS = -g -std=c++11 -I. -Wall -Wextra -Wtype-limits -Wconversion -Wshadow $(EXTRA_CXXFLAGS) # -fno-exceptions -DCPPHTTPLIB_NO_EXCEPTIONS -fsanitize=address
PREFIX ?= $(shell brew --prefix)
@@ -41,6 +41,7 @@ proxy : test_proxy
test : test.cc include_httplib.cc ../httplib.h Makefile cert.pem
$(CXX) -o $@ -I.. $(CXXFLAGS) test.cc include_httplib.cc $(TEST_ARGS)
+ @file $@
# Note: The intention of test_split is to verify that it works to compile and
# link the split httplib.h, so there is normally no need to execute it.
@@ -83,6 +84,7 @@ fuzz_test: server_fuzzer
# Fuzz target, so that you can choose which $(LIB_FUZZING_ENGINE) to use.
server_fuzzer : fuzzing/server_fuzzer.cc ../httplib.h standalone_fuzz_target_runner.o
$(CXX) -o $@ -I.. $(CXXFLAGS) $< $(OPENSSL_SUPPORT) $(ZLIB_SUPPORT) $(BROTLI_SUPPORT) $(LIB_FUZZING_ENGINE) -pthread
+ @file $@
# Standalone fuzz runner, which just reads inputs from fuzzing/corpus/ dir and
# feeds it to server_fuzzer.