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

Update bpf_conformance to latest #551

Merged
merged 1 commit into from
Dec 26, 2023
+4 −7
Merged

Update bpf_conformance to latest #551

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 0 additions & 3 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,6 @@
[submodule "external/radix_tree"]
path = external/radix_tree
url = https://github.com/ytakano/radix_tree
[submodule "external/ELFIO"]
path = external/ELFIO
url = https://github.com/serge1/ELFIO.git
[submodule "external/bpf_conformance"]
path = external/bpf_conformance
url = https://github.com/Alan-Jowett/bpf_conformance.git
Expand Down
5 changes: 3 additions & 2 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
if (NOT NUGET)
message("ERROR: You must first install nuget.exe from https://www.nuget.org/downloads")
else ()
execute_process(COMMAND ${NUGET} ARGS install "Boost" -Version 1.81.0 -ExcludeVersion -OutputDirectory ${CMAKE_BINARY_DIR}/packages)
execute_process(COMMAND ${NUGET} install "Boost" -Version 1.81.0 -ExcludeVersion -OutputDirectory ${CMAKE_BINARY_DIR}/packages)
set(BOOST_VERSION 1.81.0)
endif()
set(Boost_INCLUDE_DIRS ${CMAKE_BINARY_DIR}/packages/boost/lib/native/include)
Expand All @@ -62,7 +62,7 @@ elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
endif ()

include_directories(./external)
include_directories(./external/ELFIO)
include_directories(./external/bpf_conformance/external/elfio)
include_directories(./src)
include_directories(./external/libbtf)
include_directories(${Boost_INCLUDE_DIRS})
Expand Down Expand Up @@ -130,6 +130,7 @@ target_compile_options(ebpfverifier PUBLIC "$<$<CONFIG:DEBUG>:${DEBUG_FLAGS}>")
target_compile_options(ebpfverifier PUBLIC "$<$<CONFIG:RELEASE>:${RELEASE_FLAGS}>")
target_compile_options(ebpfverifier PUBLIC "$<$<CONFIG:SANITIZE>:${SANITIZE_FLAGS}>")

add_subdirectory("external/bpf_conformance/external/elfio")
add_subdirectory("external/bpf_conformance/src")
add_subdirectory("external/libbtf")

Expand Down
1 change: 0 additions & 1 deletion external/ELFIO
Open in desktop
Submodule ELFIO deleted from 2b457d
2 changes: 1 addition & 1 deletion external/bpf_conformance
Open in desktop
Submodule bpf_conformance updated 12 files
+24 −0 .github/scripts/build-libbpf.sh
+16 −11 .github/workflows/Build.yml
+8 −8 .github/workflows/CICD.yml
+6 −2 .github/workflows/codeql-analysis.yml
+6 −1 CMakeLists.txt
+1 −1 external/elfio
+4 −0 include/bpf_conformance.h
+148 −15 libbpf_plugin/libbpf_plugin.cc
+9 −0 negative/incorrect_return_value_high_bits.data
+19 −4 src/CMakeLists.txt
+8 −2 src/bpf_assembler.cc
+15 −15 src/bpf_conformance.cc