Clean up lint test definitionsHEADmaster

1 files changed, 20 insertions, 22 deletions

diff --git a/test/meson.build b/test/meson.build
index 5b234781..4d770304 100644
--- a/test/meson.build
+++ b/test/meson.build
@@ -334,12 +334,31 @@ python_scripts = plot_scripts + simple_scripts
 if get_option('lint')
   all_sources = sources + unit_test_sources + files('../src/serdi.c')
 
-  # Check release metadata
   if not meson.is_subproject()
+    # Check release metadata
     autoship = find_program('autoship', required: false)
     if autoship.found()
       test('autoship', autoship, args: ['test', serd_src_root], suite: 'data')
     endif
+
+    # Check code with cppcheck
+    cppcheck = find_program('cppcheck', required: false)
+    if cppcheck.found()
+      compdb_path = join_paths(serd_build_root, 'compile_commands.json')
+      suppress_path = join_paths(serd_src_root, '.suppress.cppcheck')
+      test(
+        'cppcheck',
+        cppcheck,
+        args: [
+          '--enable=warning,style,performance,portability',
+          '--error-exitcode=1',
+          '--project=' + compdb_path,
+          '--suppressions-list=' + suppress_path,
+          '-q',
+        ],
+        suite: 'code',
+      )
+    endif
   endif
 
   # Check licensing metadata
@@ -364,27 +383,6 @@ if get_option('lint')
     )
   endif
 
-  # Check code with cppcheck
-  if not meson.is_subproject()
-    cppcheck = find_program('cppcheck', required: false)
-    if cppcheck.found()
-      compdb_path = join_paths(serd_build_root, 'compile_commands.json')
-      suppress_path = join_paths(serd_src_root, '.suppress.cppcheck')
-      test(
-        'cppcheck',
-        cppcheck,
-        args: [
-          '--enable=warning,style,performance,portability',
-          '--error-exitcode=1',
-          '--project=' + compdb_path,
-          '--suppressions-list=' + suppress_path,
-          '-q',
-        ],
-        suite: 'code',
-      )
-    endif
-  endif
-
   # Check script formatting
   black = find_program('black', required: false)
   if black.found()