From eae1217ff71c060a744c24f6b09efc4ec9996e3f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ayd=C4=B1n=20Mercan?= Date: Fri, 24 Jan 2025 19:14:57 +0300 Subject: [PATCH] fixup! replace the build system with meson --- .gitlab-ci.yml | 79 +++++++++++++++++++++++++------------------------- gcovr.cfg | 2 ++ 2 files changed, 41 insertions(+), 40 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b4c471d756..5b208cb12a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -443,7 +443,7 @@ stages: - *setup_interfaces - git clone --depth 1 https://gitlab.isc.org/isc-projects/bind9-qa.git - cd bind9-qa/respdiff - - sed -i -e 's|bin/named/named|build/named|g' respdiff.sh + - sed -i -e 's|bin/named/|build/|g' -e 's|awk "/\\/bin\\/named\\/|awk "/build|g' respdiff.sh needs: [] artifacts: paths: @@ -1509,46 +1509,45 @@ respdiff: script: - bash respdiff.sh -m /usr/lib/x86_64-linux-gnu/libjemalloc.so.2 -s named -q "${PWD}/100k_mixed.txt" -c 3 -w "${PWD}/rspworkdir" "${CI_PROJECT_DIR}" "/usr/local/respdiff-reference-bind/sbin/named" -# respdiff:asan: -# <<: *respdiff_job -# <<: *default_triggering_rules -# <<: *debian_bookworm_amd64_image -# variables: -# CC: gcc -# CFLAGS: "${CFLAGS_COMMON} -Og -fsanitize=address,undefined" -# LDFLAGS: "-fsanitize=address,undefined" -# EXTRA_CONFIGURE: "--without-jemalloc" -# MAX_DISAGREEMENTS_PERCENTAGE: "0.15" -# script: -# - bash respdiff.sh -s named -q "${PWD}/100k_mixed.txt" -c 3 -w "${PWD}/rspworkdir" "${CI_PROJECT_DIR}" "/usr/local/respdiff-reference-bind/sbin/named" +respdiff:asan: + <<: *respdiff_job + <<: *default_triggering_rules + <<: *debian_bookworm_amd64_image + variables: + CC: gcc + CFLAGS: "${CFLAGS_COMMON}" + EXTRA_CONFIGURE: "-Doptimization=g -Db_sanitize=address,undefined, -Djemalloc=disabled" + MAX_DISAGREEMENTS_PERCENTAGE: "0.15" + script: + - bash respdiff.sh -s named -q "${PWD}/100k_mixed.txt" -c 3 -w "${PWD}/rspworkdir" "${CI_PROJECT_DIR}" "/usr/local/respdiff-reference-bind/sbin/named" -# respdiff:tsan: -# <<: *respdiff_job -# <<: *default_triggering_rules -# <<: *tsan_debian_bookworm_amd64_image -# variables: -# CC: gcc -# CFLAGS: "${CFLAGS_COMMON} -Og -fsanitize=thread" -# LDFLAGS: "-fsanitize=thread" -# EXTRA_CONFIGURE: "--enable-pthread-rwlock --without-jemalloc PKG_CONFIG_PATH=/opt/tsan/lib/pkgconfig" -# MAX_DISAGREEMENTS_PERCENTAGE: "0.15" -# TSAN_OPTIONS: "${TSAN_OPTIONS_DEBIAN}" -# script: -# - bash respdiff.sh -s named -q "${PWD}/100k_mixed.txt" -c 3 -w "${PWD}/rspworkdir" "${CI_PROJECT_DIR}" "/usr/local/respdiff-reference-bind/sbin/named" -# after_script: -# - *find_python -# - *parse_tsan -# -# respdiff-third-party: -# <<: *respdiff_job -# <<: *default_triggering_rules -# <<: *debian_bookworm_amd64_image -# variables: -# CC: gcc -# CFLAGS: "${CFLAGS_COMMON} -Og" -# MAX_DISAGREEMENTS_PERCENTAGE: "0.2" -# script: -# - bash respdiff.sh -s third_party -q "${PWD}/100k_mixed.txt" -c 1 -w "${PWD}/rspworkdir" "${CI_PROJECT_DIR}" +respdiff:tsan: + <<: *respdiff_job + <<: *default_triggering_rules + <<: *tsan_debian_bookworm_amd64_image + variables: + CC: gcc + CFLAGS: "${CFLAGS_COMMON}" + EXTRA_CONFIGURE: "-Doptimization=g -Db_sanitize=thread -Dlocktype=system -Djemalloc=disabled --pkg-config-path=/opt/tsan/lib/pkgconfig" + MAX_DISAGREEMENTS_PERCENTAGE: "0.15" + TSAN_OPTIONS: "${TSAN_OPTIONS_DEBIAN}" + script: + - bash respdiff.sh -s named -q "${PWD}/100k_mixed.txt" -c 3 -w "${PWD}/rspworkdir" "${CI_PROJECT_DIR}" "/usr/local/respdiff-reference-bind/sbin/named" + after_script: + - *find_python + - *parse_tsan + +respdiff-third-party: + <<: *respdiff_job + <<: *default_triggering_rules + <<: *debian_bookworm_amd64_image + variables: + CC: gcc + CFLAGS: "${CFLAGS_COMMON}" + EXTRA_CONFIGURE: "-Doptimization=g" + MAX_DISAGREEMENTS_PERCENTAGE: "0.2" + script: + - bash respdiff.sh -s third_party -q "${PWD}/100k_mixed.txt" -c 1 -w "${PWD}/rspworkdir" "${CI_PROJECT_DIR}" # Performance tests diff --git a/gcovr.cfg b/gcovr.cfg index be72f13455..84a72cfb50 100644 --- a/gcovr.cfg +++ b/gcovr.cfg @@ -10,6 +10,8 @@ # information regarding copyright ownership. gcov-parallel = yes +gcov-ignore-parse-errors = negative_hits.warn +exclude = lib/*/tests/ exclude = bin/tests/ exclude = doc/ exclude = fuzz/