mirror of
https://git.yoctoproject.org/poky
synced 2026-05-08 05:09:24 +00:00
oeqa/runtime: clean up deprecated backslash expansion
(From OE-Core rev: 77085a05240c3f8226b9f2199c977f2555807789) Signed-off-by: Ross Burton <ross.burton@arm.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
13cc2d67e7
commit
1c3c56ca19
@@ -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/'
|
||||
|
||||
@@ -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" %s/src/global.c' % self.project.targetdir)
|
||||
self.project.run_make()
|
||||
self.project.run_install()
|
||||
|
||||
@@ -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:
|
||||
|
||||
Reference in New Issue
Block a user