From: Simon Marchi <simon.marchi@efficios.com>
To: buildbot@sourceware.org
Cc: Simon Marchi <simon.marchi@efficios.com>
Subject: [PATCH 6/8] autoregen.py: print executed commands on stdout
Date: Mon, 11 Mar 2024 15:01:18 -0400 [thread overview]
Message-ID: <20240311190341.235331-7-simon.marchi@efficios.com> (raw)
In-Reply-To: <20240311190341.235331-1-simon.marchi@efficios.com>
This allows seeing what commands the buildbot executes exactly. It will
help whenever there is a difference in the generated files between what
a developer gets locally and what the buildbot gets.
---
builder/containers/autoregen.py | 23 +++++++++++++----------
1 file changed, 13 insertions(+), 10 deletions(-)
diff --git a/builder/containers/autoregen.py b/builder/containers/autoregen.py
index 6560077a406b..ff6939b66105 100755
--- a/builder/containers/autoregen.py
+++ b/builder/containers/autoregen.py
@@ -41,6 +41,15 @@ SKIP_DIRS = [
]
+# Run the shell command CMD.
+#
+# Print the command on stdout prior to running it.
+def run_shell(cmd: str):
+ cmd = f"{ENV} {cmd}"
+ print(f"+ {cmd}")
+ subprocess.check_output(f"{ENV} {cmd}", shell=True, encoding="utf8")
+
+
config_folders: list[Path] = []
for root, _, files in os.walk("."):
@@ -70,23 +79,17 @@ for folder in sorted(config_folders):
include_arg = "-I../.."
include_arg2 = "-I../../config"
- subprocess.check_output(
- f"{ENV} {ACLOCAL_BIN} --force {include_arg} {include_arg2}",
- shell=True,
- encoding="utf8",
- )
+ run_shell(f"{ACLOCAL_BIN} --force {include_arg} {include_arg2}")
if (folder / "config.in").is_file() or any(
True for line in configure_lines if line.startswith("AC_CONFIG_HEADERS")
):
- subprocess.check_output(
- f"{ENV} {AUTOHEADER_BIN} -f", shell=True, encoding="utf8"
- )
+ run_shell(f"{AUTOHEADER_BIN} -f")
# apparently automake is somehow unstable -> skip it for gotools
if any(
True for line in configure_lines if line.startswith("AM_INIT_AUTOMAKE")
) and not str(folder).endswith("gotools"):
- subprocess.check_output(f"{ENV} {AUTOMAKE_BIN} -f", shell=True, encoding="utf8")
+ run_shell(f"{AUTOMAKE_BIN} -f")
- subprocess.check_output(f"{ENV} {AUTOCONF_BIN} -f", shell=True, encoding="utf8")
+ run_shell(f"{AUTOCONF_BIN} -f")
--
2.44.0
next prev parent reply other threads:[~2024-03-11 19:03 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-03-11 19:01 [PATCH 0/8] Some changes to autoregen.py Simon Marchi
2024-03-11 19:01 ` [PATCH 1/8] autoregen.py: re-format with black 24.2.0 Simon Marchi
2024-03-11 19:01 ` [PATCH 2/8] autoregen.py: fix a pyright `reportConstantRedefinition` warning Simon Marchi
[not found] ` <871q8f7jx5.fsf@aarsen.me>
2024-03-12 16:00 ` Simon Marchi
2024-03-13 8:58 ` Mark Wielaard
2024-03-18 17:36 ` Arsen Arsenović
2024-03-11 19:01 ` [PATCH 3/8] autoregen.py: add type annotation for config_folders Simon Marchi
2024-03-11 19:01 ` [PATCH 4/8] autoregen.py: capitalize some constant names Simon Marchi
2024-03-11 19:01 ` [PATCH 5/8] autoregen.py: add non-suffixed version of the tools Simon Marchi
2024-03-11 19:01 ` Simon Marchi [this message]
2024-03-11 19:01 ` [PATCH 7/8] autoregen.py: let subprocesses print to stdout/stderr Simon Marchi
[not found] ` <87plvz7k10.fsf@aarsen.me>
2024-03-12 15:40 ` Simon Marchi
2024-03-13 8:46 ` Mark Wielaard
2024-03-11 19:01 ` [PATCH 8/8] autoregen.py: be more verbose Simon Marchi
2024-03-11 21:04 ` [PATCH 0/8] Some changes to autoregen.py Sam James
2024-03-11 21:52 ` Mark Wielaard
2024-03-12 1:53 ` Simon Marchi
2024-03-12 10:17 ` Mark Wielaard
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240311190341.235331-7-simon.marchi@efficios.com \
--to=simon.marchi@efficios.com \
--cc=buildbot@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).