* [PATCH] oeqa/runtime: clean up deprecated backslash expansion
@ 2022-11-07 22:09 Ross Burton
2022-11-08 21:55 ` [OE-core] " Alexandre Belloni
0 siblings, 1 reply; 3+ messages in thread
From: Ross Burton @ 2022-11-07 22:09 UTC (permalink / raw)
To: openembedded-core; +Cc: nd
Signed-off-by: Ross Burton <ross.burton@arm.com>
---
meta/lib/oeqa/runtime/cases/apt.py | 4 ++--
meta/lib/oeqa/runtime/cases/buildcpio.py | 7 +++++--
meta/lib/oeqa/runtime/cases/systemd.py | 2 +-
3 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/meta/lib/oeqa/runtime/cases/apt.py b/meta/lib/oeqa/runtime/cases/apt.py
index 4e09374adde..8000645843a 100644
--- a/meta/lib/oeqa/runtime/cases/apt.py
+++ b/meta/lib/oeqa/runtime/cases/apt.py
@@ -39,9 +39,9 @@ class AptRepoTest(AptTest):
self.target.run('cd %s; echo deb [ allow-insecure=yes ] %s/all ./ > sources.list' % (apt_get_sourceslist_dir, apt_get_source_server))
def setup_source_config_for_package_install_signed(self):
- apt_get_source_server = 'http:\/\/%s:%s' % (self.tc.target.server_ip, self.repo_server.port)
+ apt_get_source_server = 'http://%s:%s' % (self.tc.target.server_ip, self.repo_server.port)
apt_get_sourceslist_dir = '/etc/apt/'
- self.target.run("cd %s; cp sources.list sources.list.bak; sed -i 's/\[trusted=yes\] http:\/\/bogus_ip:bogus_port/%s/g' sources.list" % (apt_get_sourceslist_dir, apt_get_source_server))
+ self.target.run("cd %s; cp sources.list sources.list.bak; sed -i 's|\[trusted=yes\] http://bogus_ip:bogus_port|%s|g' sources.list" % (apt_get_sourceslist_dir, apt_get_source_server))
def cleanup_source_config_for_package_install(self):
apt_get_sourceslist_dir = '/etc/apt/'
diff --git a/meta/lib/oeqa/runtime/cases/buildcpio.py b/meta/lib/oeqa/runtime/cases/buildcpio.py
index bd3b46d9ef0..c08de3c914d 100644
--- a/meta/lib/oeqa/runtime/cases/buildcpio.py
+++ b/meta/lib/oeqa/runtime/cases/buildcpio.py
@@ -29,7 +29,10 @@ class BuildCpioTest(OERuntimeTestCase):
@OEHasPackage(['autoconf'])
def test_cpio(self):
self.project.download_archive()
- self.project.run_configure('--disable-maintainer-mode',
- 'sed -i -e "/char \*program_name/d" src/global.c;')
+ self.project.run_configure('--disable-maintainer-mode')
+ # This sed is needed until
+ # https://git.savannah.gnu.org/cgit/cpio.git/commit/src/global.c?id=641d3f489cf6238bb916368d4ba0d9325a235afb
+ # is in a release.
+ self.project._run(r'sed -i -e "/char \*program_name/d" src/global.c')
self.project.run_make()
self.project.run_install()
diff --git a/meta/lib/oeqa/runtime/cases/systemd.py b/meta/lib/oeqa/runtime/cases/systemd.py
index 720b4b517ae..37f295492d3 100644
--- a/meta/lib/oeqa/runtime/cases/systemd.py
+++ b/meta/lib/oeqa/runtime/cases/systemd.py
@@ -154,7 +154,7 @@ class SystemdJournalTests(SystemdTest):
"""
# The expression chain that uniquely identifies the time boot message.
- expr_items=['Startup finished', 'kernel', 'userspace','\.$']
+ expr_items=['Startup finished', 'kernel', 'userspace', r'\.$']
try:
output = self.journalctl(args='-o cat --reverse')
except AssertionError:
--
2.34.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [OE-core] [PATCH] oeqa/runtime: clean up deprecated backslash expansion
2022-11-07 22:09 [PATCH] oeqa/runtime: clean up deprecated backslash expansion Ross Burton
@ 2022-11-08 21:55 ` Alexandre Belloni
0 siblings, 0 replies; 3+ messages in thread
From: Alexandre Belloni @ 2022-11-08 21:55 UTC (permalink / raw)
To: Ross Burton; +Cc: openembedded-core, nd
On 07/11/2022 22:09:34+0000, Ross Burton wrote:
> Signed-off-by: Ross Burton <ross.burton@arm.com>
> ---
> meta/lib/oeqa/runtime/cases/apt.py | 4 ++--
> meta/lib/oeqa/runtime/cases/buildcpio.py | 7 +++++--
> meta/lib/oeqa/runtime/cases/systemd.py | 2 +-
> 3 files changed, 8 insertions(+), 5 deletions(-)
>
> diff --git a/meta/lib/oeqa/runtime/cases/apt.py b/meta/lib/oeqa/runtime/cases/apt.py
> index 4e09374adde..8000645843a 100644
> --- a/meta/lib/oeqa/runtime/cases/apt.py
> +++ b/meta/lib/oeqa/runtime/cases/apt.py
> @@ -39,9 +39,9 @@ class AptRepoTest(AptTest):
> self.target.run('cd %s; echo deb [ allow-insecure=yes ] %s/all ./ > sources.list' % (apt_get_sourceslist_dir, apt_get_source_server))
>
> def setup_source_config_for_package_install_signed(self):
> - apt_get_source_server = 'http:\/\/%s:%s' % (self.tc.target.server_ip, self.repo_server.port)
> + apt_get_source_server = 'http://%s:%s' % (self.tc.target.server_ip, self.repo_server.port)
> apt_get_sourceslist_dir = '/etc/apt/'
> - self.target.run("cd %s; cp sources.list sources.list.bak; sed -i 's/\[trusted=yes\] http:\/\/bogus_ip:bogus_port/%s/g' sources.list" % (apt_get_sourceslist_dir, apt_get_source_server))
> + self.target.run("cd %s; cp sources.list sources.list.bak; sed -i 's|\[trusted=yes\] http://bogus_ip:bogus_port|%s|g' sources.list" % (apt_get_sourceslist_dir, apt_get_source_server))
>
> def cleanup_source_config_for_package_install(self):
> apt_get_sourceslist_dir = '/etc/apt/'
> diff --git a/meta/lib/oeqa/runtime/cases/buildcpio.py b/meta/lib/oeqa/runtime/cases/buildcpio.py
> index bd3b46d9ef0..c08de3c914d 100644
> --- a/meta/lib/oeqa/runtime/cases/buildcpio.py
> +++ b/meta/lib/oeqa/runtime/cases/buildcpio.py
> @@ -29,7 +29,10 @@ class BuildCpioTest(OERuntimeTestCase):
> @OEHasPackage(['autoconf'])
> def test_cpio(self):
> self.project.download_archive()
> - self.project.run_configure('--disable-maintainer-mode',
> - 'sed -i -e "/char \*program_name/d" src/global.c;')
> + self.project.run_configure('--disable-maintainer-mode')
> + # This sed is needed until
> + # https://git.savannah.gnu.org/cgit/cpio.git/commit/src/global.c?id=641d3f489cf6238bb916368d4ba0d9325a235afb
> + # is in a release.
> + self.project._run(r'sed -i -e "/char \*program_name/d" src/global.c')
I'm pretty sure this breaks:
https://autobuilder.yoctoproject.org/typhoon/#/builders/61/builds/6120/steps/12/logs/stdio
Traceback (most recent call last):
File "/home/pokybuild/yocto-worker/pkgman-rpm-non-rpm/build/meta/lib/oeqa/core/decorator/__init__.py", line 35, in wrapped_f
return func(*args, **kwargs)
File "/home/pokybuild/yocto-worker/pkgman-rpm-non-rpm/build/meta/lib/oeqa/core/decorator/__init__.py", line 35, in wrapped_f
return func(*args, **kwargs)
File "/home/pokybuild/yocto-worker/pkgman-rpm-non-rpm/build/meta/lib/oeqa/core/decorator/__init__.py", line 35, in wrapped_f
return func(*args, **kwargs)
[Previous line repeated 1 more time]
File "/home/pokybuild/yocto-worker/pkgman-rpm-non-rpm/build/meta/lib/oeqa/runtime/cases/buildcpio.py", line 36, in test_cpio
self.project._run(r'sed -i -e "/char \*program_name/d" src/global.c')
File "/home/pokybuild/yocto-worker/pkgman-rpm-non-rpm/build/meta/lib/oeqa/runtime/utils/targetbuildproject.py", line 43, in _run
raise Exception(msg)
Exception: Command sed -i -e "/char \*program_name/d" src/global.c failed with exit code 2: sed: can't read src/global.c: No such file or directory
> self.project.run_make()
> self.project.run_install()
> diff --git a/meta/lib/oeqa/runtime/cases/systemd.py b/meta/lib/oeqa/runtime/cases/systemd.py
> index 720b4b517ae..37f295492d3 100644
> --- a/meta/lib/oeqa/runtime/cases/systemd.py
> +++ b/meta/lib/oeqa/runtime/cases/systemd.py
> @@ -154,7 +154,7 @@ class SystemdJournalTests(SystemdTest):
> """
>
> # The expression chain that uniquely identifies the time boot message.
> - expr_items=['Startup finished', 'kernel', 'userspace','\.$']
> + expr_items=['Startup finished', 'kernel', 'userspace', r'\.$']
> try:
> output = self.journalctl(args='-o cat --reverse')
> except AssertionError:
> --
> 2.34.1
>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#172937): https://lists.openembedded.org/g/openembedded-core/message/172937
> Mute This Topic: https://lists.openembedded.org/mt/94878419/3617179
> Group Owner: openembedded-core+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [alexandre.belloni@bootlin.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
--
Alexandre Belloni, co-owner and COO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [OE-core] [PATCH] oeqa/runtime: clean up deprecated backslash expansion
2023-03-30 17:12 Ross Burton
@ 2023-03-31 7:33 ` Richard Purdie
0 siblings, 0 replies; 3+ messages in thread
From: Richard Purdie @ 2023-03-31 7:33 UTC (permalink / raw)
To: Ross Burton, openembedded-core; +Cc: nd
On Thu, 2023-03-30 at 18:12 +0100, Ross Burton wrote:
> Signed-off-by: Ross Burton <ross.burton@arm.com>
> ---
> meta/lib/oeqa/runtime/cases/apt.py | 4 ++--
> meta/lib/oeqa/runtime/cases/buildcpio.py | 7 +++++--
> meta/lib/oeqa/runtime/cases/systemd.py | 2 +-
> 3 files changed, 8 insertions(+), 5 deletions(-)
>
> diff --git a/meta/lib/oeqa/runtime/cases/apt.py b/meta/lib/oeqa/runtime/cases/apt.py
> index 4e09374adde..8000645843a 100644
> --- a/meta/lib/oeqa/runtime/cases/apt.py
> +++ b/meta/lib/oeqa/runtime/cases/apt.py
> @@ -39,9 +39,9 @@ class AptRepoTest(AptTest):
> self.target.run('cd %s; echo deb [ allow-insecure=yes ] %s/all ./ > sources.list' % (apt_get_sourceslist_dir, apt_get_source_server))
>
> def setup_source_config_for_package_install_signed(self):
> - apt_get_source_server = 'http:\/\/%s:%s' % (self.tc.target.server_ip, self.repo_server.port)
> + apt_get_source_server = 'http://%s:%s' % (self.tc.target.server_ip, self.repo_server.port)
> apt_get_sourceslist_dir = '/etc/apt/'
> - self.target.run("cd %s; cp sources.list sources.list.bak; sed -i 's/\[trusted=yes\] http:\/\/bogus_ip:bogus_port/%s/g' sources.list" % (apt_get_sourceslist_dir, apt_get_source_server))
> + self.target.run("cd %s; cp sources.list sources.list.bak; sed -i 's|\[trusted=yes\] http://bogus_ip:bogus_port|%s|g' sources.list" % (apt_get_sourceslist_dir, apt_get_source_server))
>
> def cleanup_source_config_for_package_install(self):
> apt_get_sourceslist_dir = '/etc/apt/'
> diff --git a/meta/lib/oeqa/runtime/cases/buildcpio.py b/meta/lib/oeqa/runtime/cases/buildcpio.py
> index bd3b46d9ef0..c08de3c914d 100644
> --- a/meta/lib/oeqa/runtime/cases/buildcpio.py
> +++ b/meta/lib/oeqa/runtime/cases/buildcpio.py
> @@ -29,7 +29,10 @@ class BuildCpioTest(OERuntimeTestCase):
> @OEHasPackage(['autoconf'])
> def test_cpio(self):
> self.project.download_archive()
> - self.project.run_configure('--disable-maintainer-mode',
> - 'sed -i -e "/char \*program_name/d" src/global.c;')
> + self.project.run_configure('--disable-maintainer-mode')
> + # This sed is needed until
> + # https://git.savannah.gnu.org/cgit/cpio.git/commit/src/global.c?id=641d3f489cf6238bb916368d4ba0d9325a235afb
> + # is in a release.
> + self.project._run(r'sed -i -e "/char \*program_name/d" src/global.c')
> self.project.run_make()
> self.project.run_install()
> diff --git a/meta/lib/oeqa/runtime/cases/systemd.py b/meta/lib/oeqa/runtime/cases/systemd.py
> index 720b4b517ae..37f295492d3 100644
> --- a/meta/lib/oeqa/runtime/cases/systemd.py
> +++ b/meta/lib/oeqa/runtime/cases/systemd.py
> @@ -154,7 +154,7 @@ class SystemdJournalTests(SystemdTest):
> """
>
> # The expression chain that uniquely identifies the time boot message.
> - expr_items=['Startup finished', 'kernel', 'userspace','\.$']
> + expr_items=['Startup finished', 'kernel', 'userspace', r'\.$']
> try:
> output = self.journalctl(args='-o cat --reverse')
> except AssertionError:
https://autobuilder.yoctoproject.org/typhoon/#/builders/50/builds/6944/steps/12/logs/stdio
https://autobuilder.yoctoproject.org/typhoon/#/builders/64/builds/6898/steps/12/logs/stdio
https://autobuilder.yoctoproject.org/typhoon/#/builders/45/builds/6918/steps/12/logs/stdio
and quite a few more :(
Cheers,
Richard
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-03-31 7:34 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-11-07 22:09 [PATCH] oeqa/runtime: clean up deprecated backslash expansion Ross Burton
2022-11-08 21:55 ` [OE-core] " Alexandre Belloni
2023-03-30 17:12 Ross Burton
2023-03-31 7:33 ` [OE-core] " Richard Purdie
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.