Skip to content

Commit f17823a

Browse files
morrisonleviclaude
andcommitted
fix(centos-7): restore ctest, update clang/llvm/clang-tidy 17 → 19
ctest is required by the appsec C components ASAN job (make test calls ctest internally). cpack remains removed as it is genuinely unused. Also updates clang-tidy, llvm-cov, llvm-profdata, clang-format, and libc++ references from version 17 to 19 in appsec CI and cmake config. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
1 parent 86e867b commit f17823a

3 files changed

Lines changed: 24 additions & 24 deletions

File tree

.gitlab/generate-appsec.php

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
before_script:
5151
<?php unset_dd_runner_env_vars() ?>
5252
- git config --global --add safe.directory "$(pwd)/appsec/third_party/libddwaf"
53-
- sudo apt install -y clang-tidy-17 libc++-17-dev libc++abi-17-dev
53+
- sudo apt install -y clang-tidy-19 libc++-19-dev libc++abi-19-dev
5454
- mkdir -p appsec/build boost-cache boost-cache
5555
cache:
5656
- key: "appsec boost cache"
@@ -420,17 +420,17 @@
420420
./appsec/build/tests/helper/ddappsec_helper_test
421421
- |
422422
cd /tmp/cov-ext
423-
llvm-profdata-17 merge -sparse *.profraw -o default.profdata
424-
llvm-cov-17 export "$CI_PROJECT_DIR"/appsec/build/ddappsec.so \
423+
llvm-profdata-19 merge -sparse *.profraw -o default.profdata
424+
llvm-cov-19 export "$CI_PROJECT_DIR"/appsec/build/ddappsec.so \
425425
-format=lcov -instr-profile=default.profdata \
426426
> "$CI_PROJECT_DIR"/appsec/build/coverage-ext.lcov
427427
echo "Uploading extension coverage to codecov"
428428
cd "$CI_PROJECT_DIR"
429429
codecov -t "$CODECOV_TOKEN" -n appsec-extension -v -f appsec/build/coverage-ext.lcov
430430
- |
431431
cd /tmp/cov-helper
432-
llvm-profdata-17 merge -sparse *.profraw -o default.profdata
433-
llvm-cov-17 export "$CI_PROJECT_DIR"/appsec/build/tests/helper/ddappsec_helper_test \
432+
llvm-profdata-19 merge -sparse *.profraw -o default.profdata
433+
llvm-cov-19 export "$CI_PROJECT_DIR"/appsec/build/tests/helper/ddappsec_helper_test \
434434
-format=lcov -instr-profile=default.profdata \
435435
> "$CI_PROJECT_DIR/appsec/build/coverage-helper.lcov"
436436
echo "Uploading helper coverage to codecov"
@@ -500,15 +500,15 @@
500500
KUBERNETES_MEMORY_LIMIT: 10Gi
501501
ARCH: amd64
502502
script:
503-
- sudo apt install -y clang-format-17
503+
- sudo apt install -y clang-format-19
504504
- cd appsec/build
505505
- |
506506
cmake .. -DCMAKE_BUILD_TYPE=Debug -DDD_APPSEC_ENABLE_COVERAGE=OFF \
507507
-DDD_APPSEC_TESTING=OFF -DCMAKE_CXX_FLAGS="-stdlib=libc++" \
508508
-DCMAKE_CXX_LINK_FLAGS="-stdlib=libc++" \
509509
-DBOOST_CACHE_PREFIX="$CI_PROJECT_DIR/boost-cache" \
510-
-DCLANG_TIDY=/usr/bin/run-clang-tidy-17 \
511-
-DCLANG_FORMAT=/usr/bin/clang-format-17
510+
-DCLANG_TIDY=/usr/bin/run-clang-tidy-19 \
511+
-DCLANG_FORMAT=/usr/bin/clang-format-19
512512
- make -j 4 extension ddappsec-helper
513513
- make format tidy
514514

@@ -533,7 +533,7 @@
533533
-DASAN_BUILD" -DCMAKE_EXE_LINKER_FLAGS="-fsanitize=address -fsanitize=leak" \
534534
-DCMAKE_MODULE_LINKER_FLAGS="-fsanitize=address -fsanitize=leak" \
535535
-DBOOST_CACHE_PREFIX="$CI_PROJECT_DIR/boost-cache" \
536-
-DCLANG_TIDY=/usr/bin/run-clang-tidy-17
536+
-DCLANG_TIDY=/usr/bin/run-clang-tidy-19
537537
- make -j 4 ddappsec_helper_test
538538
- cd ../..; ./appsec/build/tests/helper/ddappsec_helper_test
539539

@@ -559,7 +559,7 @@
559559
# - cd -
560560
#
561561
# - cd appsec/build
562-
# - cmake .. -DCMAKE_BUILD_TYPE=Debug -DDD_APPSEC_BUILD_EXTENSION=OFF -DCMAKE_CXX_FLAGS="-stdlib=libc++" -DCMAKE_CXX_LINK_FLAGS="-stdlib=libc++" -DFUZZER_ARCHIVE_PATH=$fuzzer -DBOOST_CACHE_PREFIX=/boost-cache -DCLANG_TIDY=/usr/bin/run-clang-tidy-17
562+
# - cmake .. -DCMAKE_BUILD_TYPE=Debug -DDD_APPSEC_BUILD_EXTENSION=OFF -DCMAKE_CXX_FLAGS="-stdlib=libc++" -DCMAKE_CXX_LINK_FLAGS="-stdlib=libc++" -DFUZZER_ARCHIVE_PATH=$fuzzer -DBOOST_CACHE_PREFIX=/boost-cache -DCLANG_TIDY=/usr/bin/run-clang-tidy-19
563563
# - make -j 4 ddappsec_helper_fuzzer corpus_generator
564564
# - cd ..
565565
# - mkdir -p tests/fuzzer/{corpus,results,logs}
@@ -580,9 +580,9 @@
580580
# - LLVM_PROFILE_FILE=body.profraw ./build/tests/fuzzer/ddappsec_helper_fuzzer --log_level=off --fuzz-mode=body -max_total_time=60 -rss_limit_mb=4096 -artifact_prefix=tests/fuzzer/results/ tests/fuzzer/corpus/
581581
#
582582
# - '# Generate coverage'
583-
# - llvm-profdata-17 merge -sparse *.profraw -o default.profdata
584-
# - llvm-cov-17 show build/tests/fuzzer/ddappsec_helper_fuzzer -instr-profile=default.profdata -ignore-filename-regex="(tests|third_party|build)" -format=html > fuzzer-coverage.html
585-
# - llvm-cov-17 report -instr-profile default.profdata build/tests/fuzzer/ddappsec_helper_fuzzer -ignore-filename-regex="(tests|third_party|build)" -show-region-summary=false
583+
# - llvm-profdata-19 merge -sparse *.profraw -o default.profdata
584+
# - llvm-cov-19 show build/tests/fuzzer/ddappsec_helper_fuzzer -instr-profile=default.profdata -ignore-filename-regex="(tests|third_party|build)" -format=html > fuzzer-coverage.html
585+
# - llvm-cov-19 report -instr-profile default.profdata build/tests/fuzzer/ddappsec_helper_fuzzer -ignore-filename-regex="(tests|third_party|build)" -show-region-summary=false
586586
# artifacts:
587587
# paths:
588588
# - appsec/fuzzer-coverage.html

appsec/cmake/clang-tidy.cmake

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
1-
# Prefer a locally installed LLVM 17 run-clang-tidy (e.g. via brew install llvm@17)
1+
# Prefer a locally installed LLVM 19 run-clang-tidy (e.g. via brew install llvm@19)
22
# over the Docker-based wrapper, since native execution avoids SDK incompatibilities.
3-
set(_LLVM17_BIN /opt/homebrew/opt/llvm@17/bin)
4-
set(_LLVM17_TIDY ${_LLVM17_BIN}/run-clang-tidy)
3+
set(_LLVM19_BIN /opt/homebrew/opt/llvm@19/bin)
4+
set(_LLVM19_TIDY ${_LLVM19_BIN}/run-clang-tidy)
55
set(CLANG_TIDY_BINARY_OPT "")
6-
if(EXISTS ${_LLVM17_TIDY})
7-
set(CLANG_TIDY ${_LLVM17_TIDY})
8-
set(CLANG_TIDY_BINARY_OPT -clang-tidy-binary ${_LLVM17_BIN}/clang-tidy)
9-
message(STATUS "Using Homebrew LLVM 17 run-clang-tidy: ${CLANG_TIDY}")
6+
if(EXISTS ${_LLVM19_TIDY})
7+
set(CLANG_TIDY ${_LLVM19_TIDY})
8+
set(CLANG_TIDY_BINARY_OPT -clang-tidy-binary ${_LLVM19_BIN}/clang-tidy)
9+
message(STATUS "Using Homebrew LLVM 19 run-clang-tidy: ${CLANG_TIDY}")
1010
else()
11-
find_program(_RCT_VERSIONED run-clang-tidy-17)
11+
find_program(_RCT_VERSIONED run-clang-tidy-19)
1212
if(NOT _RCT_VERSIONED STREQUAL _RCT_VERSIONED-NOTFOUND)
1313
set(CLANG_TIDY ${_RCT_VERSIONED})
14-
find_program(_CT_VERSIONED clang-tidy-17)
14+
find_program(_CT_VERSIONED clang-tidy-19)
1515
if(NOT _CT_VERSIONED STREQUAL _CT_VERSIONED-NOTFOUND)
1616
set(CLANG_TIDY_BINARY_OPT -clang-tidy-binary ${_CT_VERSIONED})
1717
endif()
@@ -37,7 +37,7 @@ else()
3737
if(NOT CLANG_TIDY)
3838
set(CLANG_TIDY ${CMAKE_CURRENT_LIST_DIR}/clang-tools/run-clang-tidy)
3939
if(NOT EXISTS ${CLANG_TIDY})
40-
message(STATUS "Cannot find clang-tidy version 17, either set CLANG_TIDY or make it discoverable")
40+
message(STATUS "Cannot find clang-tidy version 19, either set CLANG_TIDY or make it discoverable")
4141
return()
4242
endif()
4343
message(STATUS "Using Docker-based run-clang-tidy wrapper: ${CLANG_TIDY}")

dockerfiles/ci/centos/7/base.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ RUN source scl_source enable devtoolset-7; set -eux; \
121121
mkdir -v 'build' && cd 'build'; \
122122
../bootstrap -- -DBUILD_CursesDialog=OFF && make -j $(nproc) && make install; \
123123
cd - && rm -fr build "${SRC_DIR}/cmake" \
124-
&& rm -f /usr/local/bin/cpack /usr/local/bin/ctest \
124+
&& rm -f /usr/local/bin/cpack \
125125
&& rm -rf /usr/local/share/cmake-*/Help /usr/local/share/doc/cmake* /usr/local/share/man/man1/cmake*
126126

127127
# Install Catch2

0 commit comments

Comments
 (0)