valitydev/osquery-1
14
0
Fork 0
mirror of https://github.com/valitydev/osquery-1.git synced 2024-11-07 01:55:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Silence google benchmark CMake output, remove benchmark tests

Browse Source
This commit is contained in:
Teddy Reed 2015-07-24 09:52:29 -07:00
parent 5cd9adae15
commit af13c1b7ea
5 changed files with 51 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
CMake/FindBenchmark.cmake
View File

@ -1,2 +1,8 @@
INCLUDE_DIRECTORIES("${CMAKE_SOURCE_DIR}/third-party/benchmark/include") set(BENCHMARK_SOURCE_DIR "${CMAKE_SOURCE_DIR}/third-party/benchmark")
ADD_SUBDIRECTORY("${CMAKE_SOURCE_DIR}/third-party/benchmark") set(BENCHMARK_BUILD_DIR "${CMAKE_BINARY_DIR}/third-party/benchmark")
# Only build the benchmark shared library for benchmark targets.
set(BENCHMARK_ENABLE_TESTING OFF CACHE BOOL "")
INCLUDE_DIRECTORIES("${BENCHMARK_SOURCE_DIR}/include")
ADD_SUBDIRECTORY("${BENCHMARK_SOURCE_DIR}")

7
CMakeLists.txt
View File

@ -378,10 +378,3 @@ add_custom_target(
COMMENT "Generating sdk sync: ${CMAKE_BINARY_DIR}/sync" COMMENT "Generating sdk sync: ${CMAKE_BINARY_DIR}/sync"
DEPENDS osquery_extensions osquery_amalgamation DEPENDS osquery_extensions osquery_amalgamation
) )
# make benchmark
add_custom_target(
run-benchmark
COMMAND sudo bash -c "$<TARGET_FILE:osquery_benchmarks> $ENV{BENCHMARK_TO_FILE}"
WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}"
)

65
kernel/CMakeLists.txt
View File

@ -1,4 +1,3 @@
# Set includes/compile options for kernel modules/extensions. # Set includes/compile options for kernel modules/extensions.
set(CMAKE_C_FLAGS "") set(CMAKE_C_FLAGS "")
set(CMAKE_CXX_FLAGS "") set(CMAKE_CXX_FLAGS "")
@ -159,20 +158,22 @@ if(APPLE)
COMMENT "Generating symbols and launching a debugger with kernel target..." COMMENT "Generating symbols and launching a debugger with kernel target..."
) )
add_custom_target( if(NOT DEFINED ENV{SKIP_TESTS})
kernel-test add_custom_target(
COMMAND echo "" kernel-test
COMMAND echo "Running kernel tests requires root." COMMAND echo ""
COMMAND sudo $<TARGET_FILE:osquery_kernel_tests> COMMAND echo "Running kernel tests requires root."
) COMMAND sudo $<TARGET_FILE:osquery_kernel_tests>
)
add_custom_target( add_custom_target(
run-kernel-benchmark run-kernel-benchmark
COMMAND echo "" COMMAND echo ""
COMMAND echo "Running kernel benchmarks requires root." COMMAND echo "Running kernel benchmarks requires root."
COMMAND sudo bash -c "$<TARGET_FILE:osquery_kernel_benchmarks> $ENV{BENCHMARK_TO_FILE}" COMMAND sudo bash -c "$<TARGET_FILE:osquery_kernel_benchmarks> $ENV{BENCHMARK_TO_FILE}"
WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}" WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}"
) )
endif()
elseif(LINUX) elseif(LINUX)
add_custom_target( add_custom_target(
base_kernel base_kernel
@ -199,15 +200,17 @@ elseif(LINUX)
COMMAND echo "-- No kernel unload for Linux" COMMAND echo "-- No kernel unload for Linux"
) )
add_custom_target( if(NOT DEFINED ENV{SKIP_TESTS})
kernel-test add_custom_target(
COMMAND echo "-- No kernel test is run for Linux" kernel-test
) COMMAND echo "-- No kernel test is run for Linux"
)
add_custom_target( add_custom_target(
run-kernel-benchmark run-kernel-benchmark
COMMAND echo "-- No kernel benchmark is run for Linux" COMMAND echo "-- No kernel benchmark is run for Linux"
) )
endif()
else() else()
add_custom_target( add_custom_target(
base_kernel base_kernel
@ -234,15 +237,17 @@ else()
COMMAND echo "-- No kernel unload for unsupported platform" COMMAND echo "-- No kernel unload for unsupported platform"
) )
add_custom_target( if(NOT DEFINED ENV{SKIP_TESTS})
kernel-test add_custom_target(
COMMAND echo "-- No kernel test is run for unsupported platform" kernel-test
) COMMAND echo "-- No kernel test is run for unsupported platform"
)
add_custom_target( add_custom_target(
run-kernel-benchmark run-kernel-benchmark
COMMAND echo "-- No kernel benchmark is run for unsupported platform" COMMAND echo "-- No kernel benchmark is run for unsupported platform"
) )
endif()
endif() endif()
# make kernel-build # make kernel-build

7
osquery/CMakeLists.txt
View File

@ -218,6 +218,13 @@ if(NOT DEFINED ENV{SKIP_TESTS})
target_link_libraries(osquery_kernel_benchmarks benchmark libosquery_testing) target_link_libraries(osquery_kernel_benchmarks benchmark libosquery_testing)
SET_OSQUERY_COMPILE(osquery_kernel_benchmarks "${CXX_COMPILE_FLAGS} -DKERNEL_TEST=1") SET_OSQUERY_COMPILE(osquery_kernel_benchmarks "${CXX_COMPILE_FLAGS} -DKERNEL_TEST=1")
# make benchmark
add_custom_target(
run-benchmark
COMMAND sudo bash -c "$<TARGET_FILE:osquery_benchmarks> $ENV{BENCHMARK_TO_FILE}"
WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}"
)
if(NOT OSQUERY_BUILD_SDK_ONLY) if(NOT OSQUERY_BUILD_SDK_ONLY)
# osquery core (additional) set of unit tests built outside of SDK. # osquery core (additional) set of unit tests built outside of SDK.
add_executable(osquery_additional_tests main/tests.cpp ${OSQUERY_ADDITIONAL_TESTS}) add_executable(osquery_additional_tests main/tests.cpp ${OSQUERY_ADDITIONAL_TESTS})

2
third-party

@ -1 +1 @@
Subproject commit 5f150180d1ad74b1b6b4bf0d2ec4814645d902ec Subproject commit 9d40527bd35654ffd4a39a07fcaa6623329710dd