From 589a1852c685e3e4212b5df8d4d05f538debaf42 Mon Sep 17 00:00:00 2001 From: Federico Di Pierro Date: Tue, 3 Oct 2023 10:23:57 +0200 Subject: [PATCH] chore: only build ia32 test on x86_64 arch. Signed-off-by: Federico Di Pierro --- .circleci/config.yml | 2 +- test/drivers/CMakeLists.txt | 18 ++++++++++++------ .../test_suites/actions_suite/ia32.cpp.in | 2 ++ 3 files changed, 15 insertions(+), 7 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 90d0ac45adf..a6236036969 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -11,7 +11,7 @@ jobs: name: Install deps ⛓️ command: | sudo apt update -y - sudo DEBIAN_FRONTEND=noninteractive apt install -y --no-install-recommends ca-certificates cmake build-essential git pkg-config autoconf automake libelf-dev libcap-dev linux-headers-$(uname -r) clang-14 llvm-14 gcc-multilib g++-multilib + sudo DEBIAN_FRONTEND=noninteractive apt install -y --no-install-recommends ca-certificates cmake build-essential git pkg-config autoconf automake libelf-dev libcap-dev linux-headers-$(uname -r) clang-14 llvm-14 sudo update-alternatives --install /usr/bin/clang clang /usr/bin/clang-14 90 sudo update-alternatives --install /usr/bin/llvm-strip llvm-strip /usr/bin/llvm-strip-14 90 git clone https://github.com/libbpf/bpftool.git --branch v7.0.0 --single-branch diff --git a/test/drivers/CMakeLists.txt b/test/drivers/CMakeLists.txt index 8790723070d..ab006bdc223 100644 --- a/test/drivers/CMakeLists.txt +++ b/test/drivers/CMakeLists.txt @@ -40,15 +40,21 @@ set(DRIVERS_TEST_LINK_LIBRARIES "${GTEST_MAIN_LIB}" ) -add_executable(ia32 ./helpers/ia32.c) -set_target_properties(ia32 PROPERTIES COMPILE_FLAGS "-m32" LINK_FLAGS "-m32") - set(DRIVERS_TEST_DEPENDECIES - scap - gtest - ia32 + scap + gtest ) +## IA32 tests are only available on x86_64 +if(${CMAKE_HOST_SYSTEM_PROCESSOR} STREQUAL "x86_64") + add_executable(ia32 ./helpers/ia32.c) + set_target_properties(ia32 PROPERTIES COMPILE_FLAGS "-m32" LINK_FLAGS "-m32") + set(DRIVERS_TEST_DEPENDECIES + ${DRIVERS_TEST_DEPENDECIES} + ia32 + ) +endif() + add_executable(drivers_test ${DRIVERS_TEST_SOURCES}) target_include_directories(drivers_test ${DRIVERS_TEST_INCLUDE}) target_link_libraries(drivers_test ${DRIVERS_TEST_LINK_LIBRARIES}) diff --git a/test/drivers/test_suites/actions_suite/ia32.cpp.in b/test/drivers/test_suites/actions_suite/ia32.cpp.in index baddb999a3e..39bae3613df 100644 --- a/test/drivers/test_suites/actions_suite/ia32.cpp.in +++ b/test/drivers/test_suites/actions_suite/ia32.cpp.in @@ -1,5 +1,6 @@ #include "../../event_class/event_class.h" +#if defined(__x86_64__) TEST(Actions, ia32) { /* Here we capture all syscalls... this process will send some @@ -46,3 +47,4 @@ TEST(Actions, ia32) evt_test->assert_event_presence(ret_pid, PPME_SOCKET_ACCEPT4_6_E); evt_test->assert_event_presence(ret_pid, PPME_SOCKET_ACCEPT4_6_X); } +#endif \ No newline at end of file