Add support for running aarch64 tests natively on aarch64 hardware (#278

) Signed-off-by: Will Hawkins <hawkinsw@obs.cr>
iovisor · Jun 7, 2023 · 05aba0e · 05aba0e
1 parent 96569a0
commit 05aba0e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/bpf/CMakeLists.txt b/bpf/CMakeLists.txt
@@ -10,7 +10,7 @@ execute_process(
   RESULT_VARIABLE CLANG_RETURN_CODE
   OUTPUT_STRIP_TRAILING_WHITESPACE
 )
-if(CMAKE_SYSTEM_PROCESSOR STREQUAL aarch64)
+if(CMAKE_SYSTEM_PROCESSOR STREQUAL aarch64 AND (NOT CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL aarch64))
     set(PREFIX qemu-aarch64 -L /usr/aarch64-linux-gnu)
 else()
     set(PREFIX)

diff --git a/ubpf_plugin/CMakeLists.txt b/ubpf_plugin/CMakeLists.txt
@@ -34,7 +34,7 @@ else()
     message(STATUS "Using custom bpf_conformance_runner: ${BPF_CONFORMANCE_RUNNER}")
 endif()
 
-if(CMAKE_SYSTEM_PROCESSOR STREQUAL aarch64)
+if(CMAKE_SYSTEM_PROCESSOR STREQUAL aarch64 AND (NOT CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL aarch64))
     set(PLUGIN_JIT --plugin_path ${CMAKE_BINARY_DIR}/bin/run-jit.sh)
     set(PLUGIN_INTERPRET --plugin_path ${CMAKE_BINARY_DIR}/bin/run-interpret.sh)
 else()