[prev in list] [next in list] [prev in thread] [next in thread] 

List:       openembedded-core
Subject:    [OE-core] [PATCH v2] oeqa/runtime: clean up deprecated backslash expansion
From:       "Ross Burton" <ross.burton () arm ! com>
Date:       2023-03-31 13:09:11
Message-ID: 20230331130911.1624445-1-ross.burton () arm ! com
[Download RAW message or body]

Content-Transfer-Encoding: quoted-printable

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..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" \
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()
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 (#179441): https://lists.openembedded.org/g/openembedded-core/message/179441
Mute This Topic: https://lists.openembedded.org/mt/97972719/4454766
Group Owner: openembedded-core+owner@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [openembedded-core@marc.info]
-=-=-=-=-=-=-=-=-=-=-=-



[prev in list] [next in list] [prev in thread] [next in thread]