Signed-off-by: Ross Burton <ross.burton@...>
---
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/c=
ases/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=3Dyes ] %s/all=
./ > sources.list' % (apt_get_sourceslist_dir, apt_get_source_server))
=20
def setup_source_config_for_package_install_signed(self):
- apt_get_source_server =3D 'http:\/\/%s:%s' % (self.tc.target.ser=
ver_ip, self.repo_server.port)
+ apt_get_source_server =3D 'http://%s:%s' % (self.tc.target.serve=
r_ip, self.repo_server.port)
apt_get_sourceslist_dir =3D '/etc/apt/'
- self.target.run("cd %s; cp sources.list sources.list.bak; sed -i=
's/\[trusted=3Dyes\] 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=3Dyes\] http://bogus_ip:bogus_port|%s|g' sources.list" % (a=
pt_get_sourceslist_dir, apt_get_source_server))
=20
def cleanup_source_config_for_package_install(self):
apt_get_sourceslist_dir =3D '/etc/apt/'
diff --git a/meta/lib/oeqa/runtime/cases/buildcpio.py b/meta/lib/oeqa/run=
time/cases/buildcpio.py
index bd3b46d9ef0..3728855d245 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" s=
rc/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=3D641d3f489cf6238bb916368d4ba0d9325a235afb
+ # is in a release.
+ self.project._run(r'sed -i -e "/char \*program_name/d" %s/src/gl=
obal.c' % self.project.targetdir)
self.project.run_make()
self.project.run_install()
diff --git a/meta/lib/oeqa/runtime/cases/systemd.py b/meta/lib/oeqa/runti=
me/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):
"""
=20
# The expression chain that uniquely identifies the time boot me=
ssage.
- expr_items=3D['Startup finished', 'kernel', 'userspace','\.$']
+ expr_items=3D['Startup finished', 'kernel', 'userspace', r'\.$']
try:
output =3D self.journalctl(args=3D'-o cat --reverse')
except AssertionError:
--=20
2.34.1