From fbecfbe2241ecf9ffb51b5519d10277bce746c25 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Thu, 11 May 2023 21:22:08 +0200 Subject: [PATCH 1/4] mkosi: use wildcard to shorten things --- .../usr/lib/systemd/system-preset/00-mkosi.preset | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/mkosi.presets/00-base/mkosi.extra/usr/lib/systemd/system-preset/00-mkosi.preset b/mkosi.presets/00-base/mkosi.extra/usr/lib/systemd/system-preset/00-mkosi.preset index 8fa29dc85ab..070af4c67a2 100644 --- a/mkosi.presets/00-base/mkosi.extra/usr/lib/systemd/system-preset/00-mkosi.preset +++ b/mkosi.presets/00-base/mkosi.extra/usr/lib/systemd/system-preset/00-mkosi.preset @@ -19,10 +19,9 @@ enable dbus-broker.service enable systemd-networkd.service enable systemd-networkd-wait-online.service -# We install dnf in some images but it's only going to be used rarely to install extra packages so let's not -# have dnf create its cache. -disable dnf-makecache.timer -disable dnf-makecache.service +# We install dnf in some images but it's only going to be used rarely, +# so let's not have dnf create its cache. +disable dnf-makecache.* # We have journald to receive audit data so let's make sure we're not running auditd as well disable auditd.service From e2e736cbbd8964df86c2f2f5edc693df75e3ef34 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Wed, 17 May 2023 18:24:49 +0200 Subject: [PATCH 2/4] fuzz: rename long samples With those long filenames, output doesn't fit on the terminal. --- ...ize-5609602292252672 => activation-details-path} | 0 ...619447259136.fuzz => activation-details-service} | 0 ...4cccec5427289b748e6f2a => empty-attachment-path} | 0 ...6d6f20e7af44a02daf28961 => invalid-varlink-sock} | 0 ...e-4847017160212480.fuzz => netns-invalid-socket} | Bin ...189f9259e6ce0546752085 => service-accept-socket} | 0 ...er-serialize-6018678331408384 => socket-int-max} | 0 ...nt-ipv4-dhcp-settings => dhcpv4-client-settings} | 0 ...ipv6-rapid-commit => dhcpv6-client-rapid-commit} | 0 ...ess-label-section => ipv6-address-label-section} | 0 .../{missing-strv-free.input => missing-strv-free} | Bin .../fuzz/fuzz-unit-file/dm-back\\x2dslash.swap" | 0 12 files changed, 0 insertions(+), 0 deletions(-) rename test/fuzz/fuzz-manager-serialize/{clusterfuzz-testcase-minimized-fuzz-manager-serialize-5609602292252672 => activation-details-path} (100%) rename test/fuzz/fuzz-manager-serialize/{clusterfuzz-testcase-minimized-fuzz-manager-serialize-6207619447259136.fuzz => activation-details-service} (100%) rename test/fuzz/fuzz-manager-serialize/{crash-fc5f5254c946097a774cccec5427289b748e6f2a => empty-attachment-path} (100%) rename test/fuzz/fuzz-manager-serialize/{crash-4a3d5bed0213b88d06d6f20e7af44a02daf28961 => invalid-varlink-sock} (100%) rename test/fuzz/fuzz-manager-serialize/{clusterfuzz-testcase-minimized-fuzz-manager-serialize-4847017160212480.fuzz => netns-invalid-socket} (100%) rename test/fuzz/fuzz-manager-serialize/{crash-9eec6b7ef6fd5c9568189f9259e6ce0546752085 => service-accept-socket} (100%) rename test/fuzz/fuzz-manager-serialize/{clusterfuzz-testcase-minimized-fuzz-manager-serialize-6018678331408384 => socket-int-max} (100%) rename test/fuzz/fuzz-network-parser/{dhcp-client-ipv4-dhcp-settings => dhcpv4-client-settings} (100%) rename test/fuzz/fuzz-network-parser/{dhcp-client-ipv6-rapid-commit => dhcpv6-client-rapid-commit} (100%) rename test/fuzz/fuzz-network-parser/{25-ipv6-address-label-section => ipv6-address-label-section} (100%) rename test/fuzz/fuzz-systemctl-parse-argv/{missing-strv-free.input => missing-strv-free} (100%) rename "test/fuzz/fuzz-unit-file/dev-mapper-fedora_krowka\\x2dswap.swap" => "test/fuzz/fuzz-unit-file/dm-back\\x2dslash.swap" (100%) diff --git a/test/fuzz/fuzz-manager-serialize/clusterfuzz-testcase-minimized-fuzz-manager-serialize-5609602292252672 b/test/fuzz/fuzz-manager-serialize/activation-details-path similarity index 100% rename from test/fuzz/fuzz-manager-serialize/clusterfuzz-testcase-minimized-fuzz-manager-serialize-5609602292252672 rename to test/fuzz/fuzz-manager-serialize/activation-details-path diff --git a/test/fuzz/fuzz-manager-serialize/clusterfuzz-testcase-minimized-fuzz-manager-serialize-6207619447259136.fuzz b/test/fuzz/fuzz-manager-serialize/activation-details-service similarity index 100% rename from test/fuzz/fuzz-manager-serialize/clusterfuzz-testcase-minimized-fuzz-manager-serialize-6207619447259136.fuzz rename to test/fuzz/fuzz-manager-serialize/activation-details-service diff --git a/test/fuzz/fuzz-manager-serialize/crash-fc5f5254c946097a774cccec5427289b748e6f2a b/test/fuzz/fuzz-manager-serialize/empty-attachment-path similarity index 100% rename from test/fuzz/fuzz-manager-serialize/crash-fc5f5254c946097a774cccec5427289b748e6f2a rename to test/fuzz/fuzz-manager-serialize/empty-attachment-path diff --git a/test/fuzz/fuzz-manager-serialize/crash-4a3d5bed0213b88d06d6f20e7af44a02daf28961 b/test/fuzz/fuzz-manager-serialize/invalid-varlink-sock similarity index 100% rename from test/fuzz/fuzz-manager-serialize/crash-4a3d5bed0213b88d06d6f20e7af44a02daf28961 rename to test/fuzz/fuzz-manager-serialize/invalid-varlink-sock diff --git a/test/fuzz/fuzz-manager-serialize/clusterfuzz-testcase-minimized-fuzz-manager-serialize-4847017160212480.fuzz b/test/fuzz/fuzz-manager-serialize/netns-invalid-socket similarity index 100% rename from test/fuzz/fuzz-manager-serialize/clusterfuzz-testcase-minimized-fuzz-manager-serialize-4847017160212480.fuzz rename to test/fuzz/fuzz-manager-serialize/netns-invalid-socket diff --git a/test/fuzz/fuzz-manager-serialize/crash-9eec6b7ef6fd5c9568189f9259e6ce0546752085 b/test/fuzz/fuzz-manager-serialize/service-accept-socket similarity index 100% rename from test/fuzz/fuzz-manager-serialize/crash-9eec6b7ef6fd5c9568189f9259e6ce0546752085 rename to test/fuzz/fuzz-manager-serialize/service-accept-socket diff --git a/test/fuzz/fuzz-manager-serialize/clusterfuzz-testcase-minimized-fuzz-manager-serialize-6018678331408384 b/test/fuzz/fuzz-manager-serialize/socket-int-max similarity index 100% rename from test/fuzz/fuzz-manager-serialize/clusterfuzz-testcase-minimized-fuzz-manager-serialize-6018678331408384 rename to test/fuzz/fuzz-manager-serialize/socket-int-max diff --git a/test/fuzz/fuzz-network-parser/dhcp-client-ipv4-dhcp-settings b/test/fuzz/fuzz-network-parser/dhcpv4-client-settings similarity index 100% rename from test/fuzz/fuzz-network-parser/dhcp-client-ipv4-dhcp-settings rename to test/fuzz/fuzz-network-parser/dhcpv4-client-settings diff --git a/test/fuzz/fuzz-network-parser/dhcp-client-ipv6-rapid-commit b/test/fuzz/fuzz-network-parser/dhcpv6-client-rapid-commit similarity index 100% rename from test/fuzz/fuzz-network-parser/dhcp-client-ipv6-rapid-commit rename to test/fuzz/fuzz-network-parser/dhcpv6-client-rapid-commit diff --git a/test/fuzz/fuzz-network-parser/25-ipv6-address-label-section b/test/fuzz/fuzz-network-parser/ipv6-address-label-section similarity index 100% rename from test/fuzz/fuzz-network-parser/25-ipv6-address-label-section rename to test/fuzz/fuzz-network-parser/ipv6-address-label-section diff --git a/test/fuzz/fuzz-systemctl-parse-argv/missing-strv-free.input b/test/fuzz/fuzz-systemctl-parse-argv/missing-strv-free similarity index 100% rename from test/fuzz/fuzz-systemctl-parse-argv/missing-strv-free.input rename to test/fuzz/fuzz-systemctl-parse-argv/missing-strv-free diff --git "a/test/fuzz/fuzz-unit-file/dev-mapper-fedora_krowka\\x2dswap.swap" "b/test/fuzz/fuzz-unit-file/dm-back\\x2dslash.swap" similarity index 100% rename from "test/fuzz/fuzz-unit-file/dev-mapper-fedora_krowka\\x2dswap.swap" rename to "test/fuzz/fuzz-unit-file/dm-back\\x2dslash.swap" From ec2c6ac051ffb80b7334d301362c85d404841bc9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Thu, 18 May 2023 17:14:50 +0200 Subject: [PATCH 3/4] meson: rename "fuzzers" suite to "fuzz" Fuzz tests have all the longest names, so by making this name shorter, we save three columns of screen real estate. --- meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meson.build b/meson.build index 91523e81ee9..d3d41812ca5 100644 --- a/meson.build +++ b/meson.build @@ -4607,7 +4607,7 @@ foreach fuzzer : fuzzers fuzz_in = tuple[1] test('@0@_@1@'.format(name, fuzz_in), exe, - suite : 'fuzzers', + suite : 'fuzz', args : [fuzz_dir != '' ? project_source_root / fuzz_dir / name / fuzz_in : fuzz_generated_in_dir / '@0@_@1@'.format(name, fuzz_in)]) endforeach From 02e0f430a011e83ceb54cfaab0da766a5d4ba684 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Thu, 18 May 2023 17:16:33 +0200 Subject: [PATCH 4/4] 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 90b71916b7d..f1bf073949d 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 23819d03f5a..e6724a53f4a 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 d3d41812ca5..496ca70ecc5 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 48f837cee52..f9ac1169d0d 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'],