From a535e2c9d0fd39bb00bc544ec94b6a6ff14ecaee Mon Sep 17 00:00:00 2001 From: project-repo Date: Wed, 27 Dec 2023 21:35:58 +0100 Subject: [PATCH] Fix illegal-strings test. --- meson.build | 1 + test/illegal-strings | 12 +----------- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/meson.build b/meson.build index 59f4c9f..905eb43 100644 --- a/meson.build +++ b/meson.build @@ -376,6 +376,7 @@ test('Copyright and LICENSE', find_program('test/copyright-license'), args : [ c test('Clang-format (formatting check)', find_program('test/clang-format'), args : [ cagebreak_main_file + cagebreak_source_strings + cagebreak_header_strings + fuzz_sources + fuzz_headers + fuzz_override_lib ], env : [ ''.join('MESONCURRENTCONFIGDIR=', meson.current_source_dir()) ], suite: 'devel') test('Shellcheck (script linting)', find_program('test/shellcheck'), env : [ ''.join('MESONCURRENTCONFIGDIR=', meson.current_source_dir()) ], suite: 'devel') test('GPG key validity', find_program('test/gpg-validity'), args : [ meson.project_version() ], env : [ ''.join('MESONCURRENTCONFIGDIR=', meson.current_source_dir()) ], suite: 'devel') +test('Illegal Strings', find_program('test/illegal-strings'), env : [ ''.join('MESONCURRENTCONFIGDIR=', meson.current_source_dir()) ], suite: 'devel') test('Scan-build (static analysis)', find_program('test/scan-build'), env : [ ''.join('MESONCURRENTCONFIGDIR=', meson.current_source_dir()) ], suite: 'devel-long') test('Arguments', find_program('test/arguments'), args : [ meson.project_version() ], env : [ ''.join('MESONCURRENTCONFIGDIR=', meson.current_source_dir()) ], suite: 'basic') test('Environment Variables', find_program('test/environment-variables'), env : [ ''.join('MESONCURRENTCONFIGDIR=', meson.current_source_dir()) ], suite: 'basic') diff --git a/test/illegal-strings b/test/illegal-strings index 5ae9dc0..ac7224b 100644 --- a/test/illegal-strings +++ b/test/illegal-strings @@ -8,7 +8,7 @@ RESULT=0 cd "${MESONCURRENTCONFIGDIR}" # Check that no TODO statements remain in the release directory -if ! grep -Rq "TODO" . +if grep --exclude='test/illegal-strings' --exclude-dir='build' -Rn "TODO" ./** then echo "[x] TODO" else @@ -16,14 +16,4 @@ else echo "[ ] TODO" fi -# Check that Cagebreak does not falsely claim to be POSIX compliant -if ! grep -Rq "_POSIX_C_SOURCE" . -then - echo "[x] _POSIX_C_SOURCE" -else - RESULT=1 - echo "[ ] _POSIX_C_SOURCE" -fi - - exit "${RESULT}"