From ccd3a56cf3777b105a163d9ac41998df92ecf650 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Fri, 10 Jan 2025 11:27:22 -0500 Subject: Use cppcheck working directory This allows for better analysis, and adds a cache to improve checking times, especially on repeated runs. --- test/lint/meson.build | 42 ++++++++++++++++++++++++++++++++++++++++++ test/meson.build | 39 +-------------------------------------- 2 files changed, 43 insertions(+), 38 deletions(-) create mode 100644 test/lint/meson.build (limited to 'test') diff --git a/test/lint/meson.build b/test/lint/meson.build new file mode 100644 index 0000000..13966cf --- /dev/null +++ b/test/lint/meson.build @@ -0,0 +1,42 @@ +# Copyright 2024 David Robillard +# SPDX-License-Identifier: 0BSD OR ISC + +if not meson.is_subproject() + # Check release metadata + autoship = find_program('autoship', required: get_option('tests')) + if autoship.found() + test('autoship', autoship, args: ['test', zix_src_root], suite: 'data') + endif + + # Check code with cppcheck + cppcheck = find_program('cppcheck', required: false) + if cppcheck.found() + compdb_path = join_paths(zix_build_root, 'compile_commands.json') + cppcheck_args = [ + '--cppcheck-build-dir=' + meson.current_build_dir(), + '--enable=warning,style,performance,portability', + '--error-exitcode=1', + '--project=' + compdb_path, + '--suppress=constParameterCallback', + '--suppress=constParameterPointer', + '--suppress=normalCheckLevelMaxBranches', + '--suppress=unreadVariable', + '-q', + ] + test('cppcheck', cppcheck, args: cppcheck_args, suite: 'code') + endif +endif + +# Check licensing metadata +reuse = find_program('reuse', required: get_option('tests')) +if reuse.found() + reuse_args = ['--root', zix_src_root, 'lint'] + test('REUSE', reuse, args: reuse_args, suite: 'data') +endif + +# Check code formatting +clang_format = find_program('clang-format', required: false) +if clang_format.found() + clang_format_args = ['--Werror', '--dry-run'] + c_headers + sources + test('format', clang_format, args: clang_format_args, suite: 'code') +endif diff --git a/test/meson.build b/test/meson.build index 63141bb..32cc736 100644 --- a/test/meson.build +++ b/test/meson.build @@ -6,44 +6,7 @@ ######## if get_option('lint') - if not meson.is_subproject() - # Check release metadata - autoship = find_program('autoship', required: get_option('tests')) - if autoship.found() - test('autoship', autoship, args: ['test', zix_src_root], suite: 'data') - endif - - # Check code with cppcheck - cppcheck = find_program('cppcheck', required: false) - if cppcheck.found() - compdb_path = join_paths(zix_build_root, 'compile_commands.json') - cppcheck_args = [ - '--enable=warning,style,performance,portability', - '--error-exitcode=1', - '--project=' + compdb_path, - '--suppress=constParameterCallback', - '--suppress=constParameterPointer', - '--suppress=normalCheckLevelMaxBranches', - '--suppress=unreadVariable', - '-q', - ] - test('cppcheck', cppcheck, args: cppcheck_args, suite: 'code') - endif - endif - - # Check licensing metadata - reuse = find_program('reuse', required: get_option('tests')) - if reuse.found() - reuse_args = ['--root', zix_src_root, 'lint'] - test('REUSE', reuse, args: reuse_args, suite: 'data') - endif - - # Check code formatting - clang_format = find_program('clang-format', required: false) - if clang_format.found() - clang_format_args = ['--Werror', '--dry-run'] + c_headers + sources - test('format', clang_format, args: clang_format_args, suite: 'code') - endif + subdir('lint') endif ############## -- cgit v1.2.1