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

List:       openembedded-core
Subject:    [OE-core] [PATCH 7/8] oeqa/selftest/recipetool: appendsrfile: add test for machine
From:       "Julien Stephan" <jstephan () baylibre ! com>
Date:       2023-11-30 22:01:55
Message-ID: 20231130220156.726263-8-jstephan () baylibre ! com
[Download RAW message or body]

Content-Transfer-Encoding: 8bit

Add a new test for machine specific bbappend override

Signed-off-by: Julien Stephan <jstephan@baylibre.com>
---
 meta/lib/oeqa/selftest/cases/recipetool.py | 23 +++++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)

diff --git a/meta/lib/oeqa/selftest/cases/recipetool.py \
b/meta/lib/oeqa/selftest/cases/recipetool.py index b445a40cb10..7d5ac4b47a5 100644
--- a/meta/lib/oeqa/selftest/cases/recipetool.py
+++ b/meta/lib/oeqa/selftest/cases/recipetool.py
@@ -1056,7 +1056,7 @@ class RecipetoolAppendsrcBase(RecipetoolBase):
             if p.scheme == 'file':
                 return p.netloc + p.path
 
-    def _test_appendsrcfile(self, testrecipe, filename=None, destdir=None, \
has_src_uri=True, srcdir=None, newfile=None, options=''): +    def \
_test_appendsrcfile(self, testrecipe, filename=None, destdir=None, has_src_uri=True, \
srcdir=None, newfile=None, machine=None, options=''):  if newfile is None:
             newfile = self.testfile
 
@@ -1084,12 +1084,26 @@ class RecipetoolAppendsrcBase(RecipetoolBase):
         expectedlines = ['FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"\n',
                          '\n']
 
+        override = ""
+        if machine:
+            options += ' -m %s' % machine
+            override = ':append:%s' % machine
+            expectedlines.extend(['PACKAGE_ARCH = "${MACHINE_ARCH}"\n',
+                                  '\n'])
+
         if has_src_uri:
             uri = 'file://%s' % filename
             if expected_subdir:
                 uri += ';subdir=%s' % expected_subdir
-            expectedlines.extend(['SRC_URI += "%s"\n' % uri,
-                                  '\n'])
+            if machine:
+                src_uri_line = 'SRC_URI%s = " %s"\n' % (override, uri)
+            else:
+                src_uri_line = 'SRC_URI += "%s"\n' % uri
+
+            expectedlines.extend([src_uri_line, '\n'])
+
+        if machine:
+            filename = '%s/%s' % (machine, filename)
 
         return self._try_recipetool_appendsrcfile(testrecipe, newfile, destpath, \
options, expectedlines, [filename])  
@@ -1162,6 +1176,9 @@ class RecipetoolAppendsrcTests(RecipetoolAppendsrcBase):
         output = self._test_appendsrcfile(testrecipe, filepath, subdir, \
                has_src_uri=False)
         self.assertTrue(any('with different parameters' in l for l in output))
 
+    def test_recipetool_appendsrcfile_machine(self):
+        self._test_appendsrcfile('base-files', 'a-file', machine='mymachine')
+
     def test_recipetool_appendsrcfile_replace_file_srcdir(self):
         testrecipe = 'bash'
         filepath = 'Makefile.in'
-- 
2.42.0



-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#191551): https://lists.openembedded.org/g/openembedded-core/message/191551
Mute This Topic: https://lists.openembedded.org/mt/102903939/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]