From: "Alex Bennée" <alex.bennee@linaro.org>
To: qemu-devel@nongnu.org
Cc: "Beraldo Leal" <bleal@redhat.com>,
"Peter Maydell" <peter.maydell@linaro.org>,
"Bandan Das" <bsd@redhat.com>,
"Qiuhao Li" <Qiuhao.Li@outlook.com>,
"Daniel P. Berrangé" <berrange@redhat.com>,
"Michael Roth" <michael.roth@amd.com>,
"Cleber Rosa" <crosa@redhat.com>,
"Alexander Bulekov" <alxndr@bu.edu>,
"Darren Kenny" <darren.kenny@oracle.com>,
"Stefan Hajnoczi" <stefanha@redhat.com>,
"Markus Armbruster" <armbru@redhat.com>,
"John Snow" <jsnow@redhat.com>, "Ed Maste" <emaste@freebsd.org>,
"Wainer dos Santos Moschetta" <wainersm@redhat.com>,
"Philippe Mathieu-Daudé" <philmd@linaro.org>,
"Paolo Bonzini" <pbonzini@redhat.com>,
"Li-Wen Hsu" <lwhsu@freebsd.org>,
"Marc-André Lureau" <marcandre.lureau@redhat.com>,
"Alex Bennée" <alex.bennee@linaro.org>,
"Thomas Huth" <thuth@redhat.com>
Subject: [PATCH 07/18] meson: replace Perl usage with Python
Date: Thu, 19 Jan 2023 18:04:08 +0000 [thread overview]
Message-ID: <20230119180419.30304-8-alex.bennee@linaro.org> (raw)
In-Reply-To: <20230119180419.30304-1-alex.bennee@linaro.org>
From: Marc-André Lureau <marcandre.lureau@redhat.com>
Let's try to remove Perl usage during build time.
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Message-Id: <20230110132700.833690-5-marcandre.lureau@redhat.com>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
---
tests/qapi-schema/meson.build | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/tests/qapi-schema/meson.build b/tests/qapi-schema/meson.build
index 9dfe98bc9a..d85b14f28c 100644
--- a/tests/qapi-schema/meson.build
+++ b/tests/qapi-schema/meson.build
@@ -259,22 +259,23 @@ if build_docs
# Fix possible inconsistency in line endings in generated output and
# in the golden reference (which could otherwise cause test failures
# on Windows hosts). Unfortunately diff --strip-trailing-cr
- # is GNU-diff only. The odd-looking perl is because we must avoid
+ # is GNU-diff only. The odd-looking python is because we must avoid
# using an explicit '\' character in the command arguments to
# a custom_target(), as Meson will unhelpfully replace it with a '/'
# (https://github.com/mesonbuild/meson/issues/1564)
+ remove_cr = [python, '-c', 'import sys;[sys.stdout.write(line.replace(chr(13), "")) for line in sys.stdin]']
qapi_doc_out_nocr = custom_target('QAPI rST doc newline-sanitized',
output: ['doc-good.txt.nocr'],
input: qapi_doc_out[0],
build_by_default: true,
- command: ['perl', '-pe', '$x = chr 13; s/$x$//', '@INPUT@'],
+ command: [remove_cr, '@INPUT@'],
capture: true)
qapi_doc_ref_nocr = custom_target('QAPI rST doc reference newline-sanitized',
output: ['doc-good.ref.nocr'],
input: files('doc-good.txt'),
build_by_default: true,
- command: ['perl', '-pe', '$x = chr 13; s/$x$//', '@INPUT@'],
+ command: [remove_cr, '@INPUT@'],
capture: true)
test('QAPI rST doc', diff, args: ['-u', qapi_doc_ref_nocr[0], qapi_doc_out_nocr[0]],
--
2.34.1
next prev parent reply other threads:[~2023-01-19 18:07 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-19 18:04 [PATCH 00/18] testing/next updates (gitlab, docker, check-tcg) Alex Bennée
2023-01-19 18:04 ` [PATCH 01/18] scripts/ci: update gitlab-runner playbook to use latest runner Alex Bennée
2023-01-19 18:04 ` [PATCH 02/18] gitlab: add FF_SCRIPT_SECTIONS for timings Alex Bennée
2023-01-19 18:04 ` [PATCH 03/18] gitlab: just use plain --cc=clang for custom runner build Alex Bennée
2023-01-19 18:36 ` Philippe Mathieu-Daudé
2023-01-19 18:04 ` [PATCH 04/18] tests/unit: drop hacky race avoidance in test-io-channel-command Alex Bennée
2023-01-19 18:04 ` [PATCH 05/18] build-sys: fix crlf-ending C code Alex Bennée
2023-01-19 18:04 ` [PATCH 06/18] .gitlab-ci.d/windows: do not disable opengl Alex Bennée
2023-01-19 19:32 ` Philippe Mathieu-Daudé
2023-01-19 18:04 ` Alex Bennée [this message]
2023-01-19 18:04 ` [PATCH 08/18] docs: drop texinfo options Alex Bennée
2023-01-19 18:04 ` [PATCH 09/18] gitlab: add lsan suppression file to workaround tcmalloc issues Alex Bennée
2023-01-19 18:04 ` [PATCH 10/18] Update lcitool and fedora to 37 Alex Bennée
2023-01-19 19:35 ` Philippe Mathieu-Daudé
2023-01-19 23:33 ` Paolo Bonzini
2023-01-20 10:09 ` Alex Bennée
2023-01-19 18:04 ` [PATCH 11/18] lcitool: drop perl from QEMU project/dependencies Alex Bennée
2023-01-19 19:36 ` Philippe Mathieu-Daudé
2023-01-19 18:04 ` [PATCH 12/18] lcitool: drop texinfo " Alex Bennée
2023-01-19 18:04 ` [PATCH 13/18] tests/docker: Install flex in debian-tricore-cross Alex Bennée
2023-01-19 18:04 ` [PATCH 14/18] tests/docker: drop debian-tricore-cross's partial status Alex Bennée
2023-01-19 19:36 ` Philippe Mathieu-Daudé
2023-01-19 19:52 ` Richard Henderson
2023-01-20 10:06 ` Alex Bennée
2023-01-19 18:04 ` [PATCH 15/18] tests/tcg: skip the vma-pthread test on CI Alex Bennée
2023-01-19 19:33 ` Richard Henderson
2023-01-19 18:04 ` [PATCH 16/18] tests/tcg: Use SIGKILL for timeout Alex Bennée
2023-01-19 19:55 ` Richard Henderson
2023-01-19 18:04 ` [PATCH 17/18] gitlab: wrap up test results for custom runners Alex Bennée
2023-01-20 8:26 ` Thomas Huth
2023-01-20 10:14 ` Alex Bennée
2023-01-19 18:04 ` [PATCH 18/18] MAINTAINERS: Fix the entry for tests/tcg/nios2 Alex Bennée
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=20230119180419.30304-8-alex.bennee@linaro.org \
--to=alex.bennee@linaro.org \
--cc=Qiuhao.Li@outlook.com \
--cc=alxndr@bu.edu \
--cc=armbru@redhat.com \
--cc=berrange@redhat.com \
--cc=bleal@redhat.com \
--cc=bsd@redhat.com \
--cc=crosa@redhat.com \
--cc=darren.kenny@oracle.com \
--cc=emaste@freebsd.org \
--cc=jsnow@redhat.com \
--cc=lwhsu@freebsd.org \
--cc=marcandre.lureau@redhat.com \
--cc=michael.roth@amd.com \
--cc=pbonzini@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=philmd@linaro.org \
--cc=qemu-devel@nongnu.org \
--cc=stefanha@redhat.com \
--cc=thuth@redhat.com \
--cc=wainersm@redhat.com \
/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 NNTP newsgroup(s).