From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id AA75F15808B for ; Sun, 17 Apr 2022 13:57:05 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3A45FE086D; Sun, 17 Apr 2022 13:57:04 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 985E0E086D for ; Sun, 17 Apr 2022 13:57:02 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 1C9683414BF for ; Sun, 17 Apr 2022 13:57:00 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 819F9303 for ; Sun, 17 Apr 2022 13:56:58 +0000 (UTC) From: "Mike Gilbert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Gilbert" Message-ID: <1650203814.841cfaa31184136b10b4b3c1ebc86320a831966f.floppym@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd-utils/files/, sys-apps/systemd-utils/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-apps/systemd-utils/files/250.4-test-systemd-tmpfiles.standalone.patch sys-apps/systemd-utils/systemd-utils-250.4.ebuild X-VCS-Directories: sys-apps/systemd-utils/files/ sys-apps/systemd-utils/ X-VCS-Committer: floppym X-VCS-Committer-Name: Mike Gilbert X-VCS-Revision: 841cfaa31184136b10b4b3c1ebc86320a831966f X-VCS-Branch: master Date: Sun, 17 Apr 2022 13:56:58 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 65ee3536-e822-41ce-86cd-009bdcbc4325 X-Archives-Hash: 0f687bb368aa807463be947925f5dc03 commit: 841cfaa31184136b10b4b3c1ebc86320a831966f Author: Mike Gilbert gentoo org> AuthorDate: Sun Apr 17 13:56:05 2022 +0000 Commit: Mike Gilbert gentoo org> CommitDate: Sun Apr 17 13:56:54 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=841cfaa3 sys-apps/systemd-utils: fix test-systemd-tmpfiles Signed-off-by: Mike Gilbert gentoo.org> .../250.4-test-systemd-tmpfiles.standalone.patch | 40 ++++++++++++++++++++++ sys-apps/systemd-utils/systemd-utils-250.4.ebuild | 3 +- 2 files changed, 42 insertions(+), 1 deletion(-) diff --git a/sys-apps/systemd-utils/files/250.4-test-systemd-tmpfiles.standalone.patch b/sys-apps/systemd-utils/files/250.4-test-systemd-tmpfiles.standalone.patch new file mode 100644 index 000000000000..a915cbb43115 --- /dev/null +++ b/sys-apps/systemd-utils/files/250.4-test-systemd-tmpfiles.standalone.patch @@ -0,0 +1,40 @@ +From 55bf689308ed00692494d3623bd2064f33c9bbbe Mon Sep 17 00:00:00 2001 +From: Mike Gilbert +Date: Sun, 17 Apr 2022 09:48:28 -0400 +Subject: [PATCH] Add test support for systemd-tmpfiles.standalone + +--- + meson.build | 10 +++++++++- + 1 file changed, 9 insertions(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index 458370e83d..d60be1b050 100644 +--- a/meson.build ++++ b/meson.build +@@ -3451,7 +3451,7 @@ if conf.get('ENABLE_TMPFILES') == 1 + endif + + if have_standalone_binaries +- public_programs += executable( ++ exe = executable( + 'systemd-tmpfiles.standalone', + systemd_tmpfiles_sources, + include_directories : includes, +@@ -3463,6 +3463,14 @@ if conf.get('ENABLE_TMPFILES') == 1 + dependencies : [libacl], + install : true, + install_dir : rootbindir) ++ public_programs += exe ++ ++ if want_tests != 'false' ++ test('test-systemd-tmpfiles.standalone', ++ test_systemd_tmpfiles_py, ++ # https://github.com/mesonbuild/meson/issues/2681 ++ args : exe.full_path()) ++ endif + endif + endif + +-- +2.35.1 + diff --git a/sys-apps/systemd-utils/systemd-utils-250.4.ebuild b/sys-apps/systemd-utils/systemd-utils-250.4.ebuild index cda7180f1b83..aee6304e1eaa 100644 --- a/sys-apps/systemd-utils/systemd-utils-250.4.ebuild +++ b/sys-apps/systemd-utils/systemd-utils-250.4.ebuild @@ -98,6 +98,7 @@ QA_FLAGS_IGNORED="usr/lib/systemd/boot/efi/.*" src_prepare() { local PATCHES=( + "${FILESDIR}/250.4-test-systemd-tmpfiles.standalone.patch" ) if use elibc_musl; then PATCHES+=( "${WORKDIR}/${MUSL_PATCHSET}" ) @@ -325,7 +326,7 @@ multilib_src_test() { fi if use tmpfiles; then tests+=( - test-systemd-tmpfiles + test-systemd-tmpfiles.standalone test-tmpfiles ) fi