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

32-bit tests #311

Open
wants to merge 5 commits into
base: main
Choose a base branch
from
Open

32-bit tests #311

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f934b49
Force test target to be built in 32 bits
Jan 13, 2025
baff537
Force dynamic runtime linking in gtest
Jan 13, 2025
0fa8cfe
Add GNU multilib to test github action
Jan 13, 2025
848804f
Remove useless whitespace
Jan 13, 2025
5b98eec
Add multilib to dependency installation instructions where required
Jan 15, 2025
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
4 changes: 4 additions & 0 deletions .github/workflows/test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,10 @@ jobs:

steps:
- uses: actions/checkout@v3
- name: Install GNU cross compilation
run: |
sudo apt-get update
sudo apt-get install gcc-multilib g++-multilib
- name: Configure CMake
run: |
mkdir build
Expand Down
2 changes: 2 additions & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ elseif(${CMAKE_BUILD_TYPE} MATCHES HIL)
include(${CMAKE_SOURCE_DIR}/cmake/fetch_googletest.cmake)
set(CMAKE_TOOLCHAIN_FILE ${CMAKE_SOURCE_DIR}/cmake/toolchain_hil_gcc.cmake)
elseif(${CMAKE_BUILD_TYPE} MATCHES Test)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m32")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -m32")
include(${CMAKE_SOURCE_DIR}/cmake/fetch_googletest.cmake)
set(CMAKE_TOOLCHAIN_FILE ${CMAKE_SOURCE_DIR}/cmake/toolchain_linux_gcc.cmake)
elseif(${CMAKE_BUILD_TYPE} MATCHES Examples)
Expand Down
6 changes: 3 additions & 3 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ This command opens a terminal in VSCode: ```Ctrl + Shift + ` ```
Enter these commands in your terminal:
```
sudo apt-get update
sudo apt-get install -y python3-pip build-essential cmake
sudo apt-get install -y python3-pip build-essential cmake gcc-multilib g++-multilib
pip3 install -r requirements.txt
pre-commit install
```
Expand All @@ -83,7 +83,7 @@ Skip this section if you set up a Docker development environment.
2. In WSL2, run the following:
```sh
sudo apt-get update
sudo apt-get install build-essential
sudo apt-get install build-essential gcc-multilib g++-multilib
```
3. Choose the environment where you'll be running `git commit` (either WSL2 or the host) and install Python 3.10 and pip. (Only required for Python devs)
A. If using WSL, follow the instructions under the `Linux` section 2.
Expand Down Expand Up @@ -144,7 +144,7 @@ Skip this section if you set up a Docker development environment.
1. Install required build tools (CMake, Make, gcc)
```sh
sudo apt-get update
sudo apt-get install build-essential
sudo apt-get install build-essential gcc-multilib g++-multilib
```

2. Install Python 3.10 and setup Python virtual environment (Only required for Python devs)
Expand Down
2 changes: 2 additions & 0 deletions cmake/fetch_googletest.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ googletest
GIT_REPOSITORY https://github.com/google/googletest.git
GIT_TAG release-1.11.0
)

set(gtest_force_shared_crt ON CACHE BOOL "" FORCE)
FetchContent_MakeAvailable(googletest)
add_library(GTest::GTest INTERFACE IMPORTED)
target_link_libraries(GTest::GTest INTERFACE gtest_main)
Expand Down
Loading