From 02e0f430a011e83ceb54cfaab0da766a5d4ba684 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
Date: Thu, 18 May 2023 17:16:33 +0200
Subject: [PATCH] meson: rename "dist-check" suite to "dist"

*Now* one of those tests is the longest, let's make them a bit shorter.
---
 hwdb.d/meson.build |  2 +-
 man/meson.build    |  2 +-
 meson.build        | 10 +++++-----
 test/meson.build   |  6 +++---
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/hwdb.d/meson.build b/hwdb.d/meson.build
index 90b71916b7..f1bf073949 100644
--- a/hwdb.d/meson.build
+++ b/hwdb.d/meson.build
@@ -61,7 +61,7 @@ if conf.get('ENABLE_HWDB') == 1
                 parse_hwdb_py = find_program('parse_hwdb.py')
                 test('parse-hwdb',
                      parse_hwdb_py,
-                     suite : 'dist-check',
+                     suite : 'dist',
                      args : [hwdb_files_test,
                              auto_suspend_rules],
                      timeout : 90)
diff --git a/man/meson.build b/man/meson.build
index 23819d03f5..e6724a53f4 100644
--- a/man/meson.build
+++ b/man/meson.build
@@ -226,7 +226,7 @@ update_dbus_docs = custom_target(
 if conf.get('BUILD_MODE_DEVELOPER') == 1
         test('dbus-docs-fresh',
              update_dbus_docs_py,
-             suite : 'dist-check',
+             suite : 'dist',
              args : ['--build-dir', project_build_root, '--test', dbus_docs],
              depends : dbus_programs)
 endif
diff --git a/meson.build b/meson.build
index d3d41812ca..496ca70ecc 100644
--- a/meson.build
+++ b/meson.build
@@ -4109,7 +4109,7 @@ if conf.get('ENABLE_HWDB') == 1
         if want_tests != 'false'
                 test('hwdb-test',
                      hwdb_test_sh,
-                     suite : 'dist-check',
+                     suite : 'dist',
                      args : [systemd_hwdb.full_path()],
                      timeout : 90)
         endif
@@ -4159,7 +4159,7 @@ public_programs += udevadm
 if want_tests != 'false'
         test('udev-rules-check',
              udevadm,
-             suite : 'dist-check',
+             suite : 'dist',
              args : ['verify', '--resolve-names=never', all_rules])
 endif
 
@@ -4669,7 +4669,7 @@ jekyll = find_program('jekyll', required : false)
 if get_option('mode') == 'developer' and want_tests != 'false' and jekyll.found()
         test('github-pages',
              jekyll,
-             suite : 'dist-check',
+             suite : 'dist',
              args : ['build',
                      '--source', project_source_root / 'docs',
                      '--destination', project_build_root / '_site'])
@@ -4685,13 +4685,13 @@ foreach exec : public_programs
         if want_tests != 'false'
                 test('check-help-' + name,
                      check_help,
-                     suite : 'dist-check',
+                     suite : 'dist',
                      args : exec.full_path(),
                      depends: exec)
 
                 test('check-version-' + name,
                      check_version,
-                     suite : 'dist-check',
+                     suite : 'dist',
                      args : [exec.full_path(),
                              meson.project_version()],
                      depends: exec)
diff --git a/test/meson.build b/test/meson.build
index 48f837cee5..f9ac1169d0 100644
--- a/test/meson.build
+++ b/test/meson.build
@@ -91,7 +91,7 @@ rule_syntax_check_py = find_program('rule-syntax-check.py')
 if want_tests != 'false'
         test('rule-syntax-check',
              rule_syntax_check_py,
-             suite : 'dist-check',
+             suite : 'dist',
              args : all_rules)
 endif
 
@@ -133,7 +133,7 @@ if rpm.found() and rpmspec.found()
         if want_tests != 'false'
                 test('test-rpm-macros',
                      test_rpm_macros,
-                     suite : 'dist-check',
+                     suite : 'dist',
                      args : [project_build_root])
         endif
 else
@@ -163,7 +163,7 @@ if want_tests != 'false' and dmi_arches.contains(host_machine.cpu_family())
 
                 test(name,
                      udev_dmi_memory_id_test,
-                     suite : 'dist-check',
+                     suite : 'dist',
                      args : [udev_prog_paths['dmi_memory_id'].full_path(),
                              source,
                              source + '.txt'],