From f905bd8e17bfcee7240ee3174f5ed420043c8bad Mon Sep 17 00:00:00 2001
From: David Robillard <d@drobilla.net>
Date: Mon, 3 Apr 2023 09:00:23 -0400
Subject: Use new meson strict warning system

Meson includes warning_level=everything as of version 1.0.0, which supercedes
maintaining redundant lists of warning flags here.
---
 test/headers/meson.build |  4 ++--
 test/meson.build         | 32 +++++++++++++-------------------
 2 files changed, 15 insertions(+), 21 deletions(-)

(limited to 'test')

diff --git a/test/headers/meson.build b/test/headers/meson.build
index 0c4e97ea..78a48618 100644
--- a/test/headers/meson.build
+++ b/test/headers/meson.build
@@ -1,9 +1,9 @@
-# Copyright 2020-2022 David Robillard <d@drobilla.net>
+# Copyright 2020-2023 David Robillard <d@drobilla.net>
 # SPDX-License-Identifier: 0BSD OR ISC
 
 header_c_suppressions = []
 
-if get_option('strict')
+if get_option('warning_level') == 'everything'
   if cc.get_id() == 'clang'
     header_c_suppressions += [
       '-Wno-padded',
diff --git a/test/meson.build b/test/meson.build
index 45173690..283ce3e8 100644
--- a/test/meson.build
+++ b/test/meson.build
@@ -5,11 +5,20 @@ run_suite = find_program('run_suite.py')
 
 wrapper = meson.get_external_property('exe_wrapper', '')
 
-####################
-# Project Metadata #
-####################
+########################
+# Scripts and Metadata #
+########################
 
-if get_option('strict')
+python_scripts = files(
+  '../scripts/serd_bench.py',
+  'run_suite.py',
+  'serd_test_util/__init__.py',
+  'test_quiet.py',
+  'test_stdin.py',
+  'test_write_error.py',
+)
+
+if get_option('lint')
   # Check release metadata
   if not meson.is_subproject()
     autoship = find_program('autoship', required: false)
@@ -28,22 +37,7 @@ if get_option('strict')
       suite: 'data',
     )
   endif
-endif
-
-###########
-# Scripts #
-###########
-
-python_scripts = files(
-  '../scripts/serd_bench.py',
-  'run_suite.py',
-  'serd_test_util/__init__.py',
-  'test_quiet.py',
-  'test_stdin.py',
-  'test_write_error.py',
-)
 
-if get_option('strict')
   # Check script formatting
   black = find_program('black', required: false)
   if black.found()
-- 
cgit v1.2.1