Meson: add target 'cppcheck'.

Author: sergev

meson.build

@@ -41,6 +41,7 @@ simulator = static_library('simulator',
         'cosy.cpp',
     ],
     cpp_args: [
+        '-Werror',
         '-Wshadow',
         '-DVERSION_STRING="' + meson.project_version() + '.' + revcount + '-' + hash + '"'
     ]
@@ -69,5 +70,23 @@ install_data([
     install_mode: 'r--r--r--',
 )
 
+#
+# Run cppcheck
+#
+run_target('cppcheck', command: [
+        'cppcheck',
+        '--project=' + join_paths(meson.project_build_root(), 'compile_commands.json'),
+        '--std=c++17',
+        '--enable=style',
+        '--check-level=exhaustive',
+        '--error-exitcode=1', # Fail on any issues
+        '--inline-suppr', # Enable inline control like // cppcheck-suppress 'id'
+        '--quiet', # No progress report messages
+        '--suppress=badBitmaskCheck', # Allow redundant zero operands
+        '--suppress=*:*/gtest/*', # Ignore issues in Googletest
+        '--library=' + join_paths(meson.source_root(), 'tests/googletest.xml'), # Parse TEST() macro properly
+    ]
+)
+
 # Tests are defined in 'tests/meson.build' file
 subdir('tests')

tests/cli_test.cpp

@@ -102,7 +102,7 @@ TEST(cli, trace_end_file)
     auto trace = file_contents_split(trace_filename);
 
     // Check output.
-    ASSERT_GE(trace.size(), 4);
+    ASSERT_GE(trace.size(), 4u);
     EXPECT_TRUE(starts_with(trace[0], "Dubna Simulator Version"));
     EXPECT_STREQ(trace[1].c_str(), "02010 R: 00 070 3002 *70 3002");
     EXPECT_STREQ(trace[2].c_str(), "      Drum 21 PhysRead [00000-00377] = Zone 1 Sector 2");

tests/fixture_machine.h

@@ -96,7 +96,9 @@ class dubna_machine : public ::testing::Test {
     void test_cernlib(unsigned lib_num, const std::string &file_base)
     {
         std::string job_filename    = get_test_name() + ".dub";
-        std::string input_dir       = (lib_num == 1) ? (TEST_DIR "/lib1/") : (TEST_DIR "/lib2/");
+        std::string lib1_dir        = std::string(TEST_DIR "/lib1/");
+        std::string lib2_dir        = std::string(TEST_DIR "/lib2/");
+        std::string input_dir       = (lib_num == 1) ? lib1_dir : lib2_dir;
         std::string input_filename  = input_dir + file_base + ".f";
         std::string expect_filename = input_dir + "/expect_" + file_base + ".txt";
         std::string prolog          = "*name " + file_base + "\n" +

tests/meson.build

@@ -24,9 +24,10 @@ unit_tests = executable('unit_tests',
     include_directories: '..',
     link_with: simulator,
     cpp_args: [
+        '-Werror',
         '-Wshadow',
         '-DTEST_DIR="' + meson.current_source_dir() + '"',
-        '-DBUILD_DIR="' + meson.build_root() + '"',
+        '-DBUILD_DIR="' + meson.project_build_root() + '"',
     ],
     build_by_default: false
 )