Skip to content

Commit

Permalink
ci: cmake format fix (#11809)
Browse files Browse the repository at this point in the history
## Checklist
- [x] PR author has checked that all the criteria below are met
- The PR description includes an overview of the change
- The PR description articulates the motivation for the change
- The change includes tests OR the PR description describes a testing
strategy
- The PR description notes risks associated with the change, if any
- Newly-added code is easy to change
- The change follows the [library release note
guidelines](https://ddtrace.readthedocs.io/en/stable/releasenotes.html)
- The change includes or references documentation updates if necessary
- Backport labels are set (if
[applicable](https://ddtrace.readthedocs.io/en/latest/contributing.html#backporting))

## Reviewer Checklist
- [x] Reviewer has checked that all the criteria below are met 
- Title is accurate
- All changes are related to the pull request's stated goal
- Avoids breaking
[API](https://ddtrace.readthedocs.io/en/stable/versioning.html#interfaces)
changes
- Testing strategy adequately addresses listed risks
- Newly-added code is easy to change
- Release note makes sense to a user of the library
- If necessary, author has acknowledged and discussed the performance
implications of this PR as reported in the benchmarks PR comment
- Backport labels are set in a manner that is consistent with the
[release branch maintenance
policy](https://ddtrace.readthedocs.io/en/latest/contributing.html#backporting)
  • Loading branch information
taegyunkim authored Dec 19, 2024
1 parent f810101 commit 5cee25e
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 7 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,16 @@ include(GoogleTest)
include(AnalysisFunc)

if(DO_VALGRIND)
find_program(VALGRIND_EXECUTABLE NAMES valgrind PATHS /usr/bin /usr/local/bin)
find_program(
VALGRIND_EXECUTABLE
NAMES valgrind
PATHS /usr/bin /usr/local/bin)

if (VALGRIND_EXECUTABLE)
if(VALGRIND_EXECUTABLE)
set(MEMORYCHECK_COMMAND "${VALGRIND_EXECUTABLE}")
set(MEMORYCHECK_COMMAND_OPTIONS "--leak-check=full --show-leak-kinds=definite --errors-for-leak-kinds=definite --trace-children=yes --error-exitcode=1 --log-fd=1 --suppressions=${CMAKE_CURRENT_SOURCE_DIR}/valgrind.supp")
set(MEMORYCHECK_COMMAND_OPTIONS
"--leak-check=full --show-leak-kinds=definite --errors-for-leak-kinds=definite --trace-children=yes --error-exitcode=1 --log-fd=1 --suppressions=${CMAKE_CURRENT_SOURCE_DIR}/valgrind.supp"
)
else()
message(FATAL_ERROR "Valgrind not found")
endif()
Expand Down
11 changes: 8 additions & 3 deletions ddtrace/internal/datadog/profiling/stack_v2/test/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,16 @@ include(GoogleTest)
include(AnalysisFunc)

if(DO_VALGRIND)
find_program(VALGRIND_EXECUTABLE NAMES valgrind PATHS /usr/bin /usr/local/bin)
find_program(
VALGRIND_EXECUTABLE
NAMES valgrind
PATHS /usr/bin /usr/local/bin)

if (VALGRIND_EXECUTABLE)
if(VALGRIND_EXECUTABLE)
set(MEMORYCHECK_COMMAND "${VALGRIND_EXECUTABLE}")
set(MEMORYCHECK_COMMAND_OPTIONS "--leak-check=full --show-leak-kinds=definite --errors-for-leak-kinds=definite --trace-children=yes --error-exitcode=1 --log-fd=1 --suppressions=${CMAKE_CURRENT_SOURCE_DIR}/valgrind.supp")
set(MEMORYCHECK_COMMAND_OPTIONS
"--leak-check=full --show-leak-kinds=definite --errors-for-leak-kinds=definite --trace-children=yes --error-exitcode=1 --log-fd=1 --suppressions=${CMAKE_CURRENT_SOURCE_DIR}/valgrind.supp"
)
else()
message(FATAL_ERROR "Valgrind not found")
endif()
Expand Down
2 changes: 1 addition & 1 deletion scripts/gen_circleci_config.py
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ def check(name: str, command: str, paths: t.Set[str]) -> None:
check(
name="Style",
command="hatch run lint:style",
paths={"docker*", "*.py", "*.pyi", "hatch.toml", "pyproject.toml", "*.cpp", "*.h"},
paths={"docker*", "*.py", "*.pyi", "hatch.toml", "pyproject.toml", "*.cpp", "*.h", "CMakeLists.txt"},
)
check(
name="Typing",
Expand Down

0 comments on commit 5cee25e

Please sign in to comment.