summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--bitbake/lib/bb/cooker.py7
-rw-r--r--documentation/bsp-guide/bsp.rst4
-rw-r--r--documentation/conf.py6
-rw-r--r--documentation/ref-manual/classes.rst4
-rw-r--r--documentation/ref-manual/yocto-project-supported-features.rst2
-rw-r--r--meta/classes-recipe/testexport.bbclass43
-rw-r--r--meta/recipes-multimedia/libpng/libpng_1.6.48.bb (renamed from meta/recipes-multimedia/libpng/libpng_1.6.49.bb)2
-rwxr-xr-xscripts/oe-test12
8 files changed, 40 insertions, 40 deletions
diff --git a/bitbake/lib/bb/cooker.py b/bitbake/lib/bb/cooker.py
index f813627661..938b999b4f 100644
--- a/bitbake/lib/bb/cooker.py
+++ b/bitbake/lib/bb/cooker.py
@@ -2067,8 +2067,9 @@ class Parser(multiprocessing.Process):
2067 2067
2068 jobid = None 2068 jobid = None
2069 try: 2069 try:
2070 jobid = self.jobid_queue.get(True, 0.5) 2070 # Have to wait for all parsers to have forked
2071 except (ValueError, OSError): 2071 jobid = self.jobid_queue.get(True, 5)
2072 except (ValueError, OSError, queue.Empty):
2072 havejobs = False 2073 havejobs = False
2073 2074
2074 if jobid is not None: 2075 if jobid is not None:
@@ -2291,7 +2292,7 @@ class CookerParser(object):
2291 yield result 2292 yield result
2292 2293
2293 if not (self.parsed >= self.toparse): 2294 if not (self.parsed >= self.toparse):
2294 raise bb.parse.ParseError("Not all recipes parsed, parser thread killed/died? Exiting.", None) 2295 raise bb.parse.ParseError("Not all recipes parsed, parser thread killed/died? (%s %s of %s) Exiting." % (len(self.processes), self.parsed, self.toparse), None)
2295 2296
2296 2297
2297 def parse_next(self): 2298 def parse_next(self):
diff --git a/documentation/bsp-guide/bsp.rst b/documentation/bsp-guide/bsp.rst
index 09246b4ae4..7eaa4d8700 100644
--- a/documentation/bsp-guide/bsp.rst
+++ b/documentation/bsp-guide/bsp.rst
@@ -172,7 +172,7 @@ section.
172#. *Optionally Clone the meta-intel BSP Layer:* If your hardware is 172#. *Optionally Clone the meta-intel BSP Layer:* If your hardware is
173 based on current Intel CPUs and devices, you can leverage this BSP 173 based on current Intel CPUs and devices, you can leverage this BSP
174 layer. For details on the ``meta-intel`` BSP layer, see the layer's 174 layer. For details on the ``meta-intel`` BSP layer, see the layer's
175 :yocto_git:`README </meta-intel/tree/README>` file. 175 :yocto_git:`README </meta-intel/tree/README.md>` file.
176 176
177 #. *Navigate to Your Source Directory:* Typically, you set up the 177 #. *Navigate to Your Source Directory:* Typically, you set up the
178 ``meta-intel`` Git repository inside the :term:`Source Directory` (e.g. 178 ``meta-intel`` Git repository inside the :term:`Source Directory` (e.g.
@@ -204,7 +204,7 @@ section.
204 .. note:: 204 .. note::
205 205
206 To see the available branch names in a cloned repository, use the ``git 206 To see the available branch names in a cloned repository, use the ``git
207 branch -al`` command. See the 207 branch -a`` command. See the
208 ":ref:`dev-manual/start:checking out by branch in poky`" 208 ":ref:`dev-manual/start:checking out by branch in poky`"
209 section in the Yocto Project Development Tasks Manual for more 209 section in the Yocto Project Development Tasks Manual for more
210 information. 210 information.
diff --git a/documentation/conf.py b/documentation/conf.py
index 1eca8756ab..c07b6c4199 100644
--- a/documentation/conf.py
+++ b/documentation/conf.py
@@ -179,13 +179,13 @@ from sphinx.search import SearchEnglish
179from sphinx.search import languages 179from sphinx.search import languages
180class DashFriendlySearchEnglish(SearchEnglish): 180class DashFriendlySearchEnglish(SearchEnglish):
181 181
182 # Accept words that can include hyphens 182 # Accept words that can include 'inner' hyphens or dots
183 _word_re = re.compile(r'[\w\-]+') 183 _word_re = re.compile(r'[\w]+(?:[\.\-][\w]+)*')
184 184
185 js_splitter_code = r""" 185 js_splitter_code = r"""
186function splitQuery(query) { 186function splitQuery(query) {
187 return query 187 return query
188 .split(/[^\p{Letter}\p{Number}_\p{Emoji_Presentation}-]+/gu) 188 .split(/[^\p{Letter}\p{Number}_\p{Emoji_Presentation}\-\.]+/gu)
189 .filter(term => term.length > 0); 189 .filter(term => term.length > 0);
190} 190}
191""" 191"""
diff --git a/documentation/ref-manual/classes.rst b/documentation/ref-manual/classes.rst
index f2f6e6e411..4705ca3f4d 100644
--- a/documentation/ref-manual/classes.rst
+++ b/documentation/ref-manual/classes.rst
@@ -1591,6 +1591,10 @@ The tests you can list with the :term:`WARN_QA` and
1591 For example, assignments such as ``FILES:${PN} = "xyz"`` effectively 1591 For example, assignments such as ``FILES:${PN} = "xyz"`` effectively
1592 turn into ``FILES = "xyz"``. 1592 turn into ``FILES = "xyz"``.
1593 1593
1594- ``recipe-naming:`` Checks that the recipe name and recipe class match, so
1595 that ``*-native`` recipes inherit :ref:`ref-classes-native` and
1596 ``nativesdk-*`` recipes inherit :ref:`ref-classes-nativesdk`.
1597
1594- ``rpaths:`` Checks for rpaths in the binaries that contain build 1598- ``rpaths:`` Checks for rpaths in the binaries that contain build
1595 system paths such as :term:`TMPDIR`. If this test fails, bad ``-rpath`` 1599 system paths such as :term:`TMPDIR`. If this test fails, bad ``-rpath``
1596 options are being passed to the linker commands and your binaries 1600 options are being passed to the linker commands and your binaries
diff --git a/documentation/ref-manual/yocto-project-supported-features.rst b/documentation/ref-manual/yocto-project-supported-features.rst
index 283c79d4cc..0e6c33cf6e 100644
--- a/documentation/ref-manual/yocto-project-supported-features.rst
+++ b/documentation/ref-manual/yocto-project-supported-features.rst
@@ -86,7 +86,7 @@ Below is a list of primary tested features, their maintainer(s) and builder(s):
86 - meta-aws 86 - meta-aws
87 * - `meta-intel <https://git.yoctoproject.org/meta-intel>`__ 87 * - `meta-intel <https://git.yoctoproject.org/meta-intel>`__
88 - meta-intel layer testing 88 - meta-intel layer testing
89 - TBD 89 - meta-intel mailing list <meta-intel@lists.yoctoproject.org>
90 - meta-intel 90 - meta-intel
91 * - `meta-exein <https://github.com/exein-io/meta-exein>`__ 91 * - `meta-exein <https://github.com/exein-io/meta-exein>`__
92 - meta-exein layer testing 92 - meta-exein layer testing
diff --git a/meta/classes-recipe/testexport.bbclass b/meta/classes-recipe/testexport.bbclass
index 3005fc0dfa..2da5dbcb6b 100644
--- a/meta/classes-recipe/testexport.bbclass
+++ b/meta/classes-recipe/testexport.bbclass
@@ -85,7 +85,6 @@ def copy_needed_files(d, tc):
85 85
86 export_path = d.getVar('TEST_EXPORT_DIR') 86 export_path = d.getVar('TEST_EXPORT_DIR')
87 corebase_path = d.getVar('COREBASE') 87 corebase_path = d.getVar('COREBASE')
88 bblayers = d.getVar('BBLAYERS').split()
89 88
90 # Clean everything before starting 89 # Clean everything before starting
91 oe.path.remove(export_path) 90 oe.path.remove(export_path)
@@ -93,11 +92,17 @@ def copy_needed_files(d, tc):
93 92
94 # The source of files to copy are relative to 'COREBASE' directory 93 # The source of files to copy are relative to 'COREBASE' directory
95 # The destination is relative to 'TEST_EXPORT_DIR' 94 # The destination is relative to 'TEST_EXPORT_DIR'
96 # core files/dirs first 95 # Because we are squashing the libraries, we need to remove
97 core_files_to_copy = [ os.path.join('scripts', 'oe-test'), 96 # the layer/script directory
97 files_to_copy = [ os.path.join('meta', 'lib', 'oeqa', 'core'),
98 os.path.join('meta', 'lib', 'oeqa', 'runtime'),
99 os.path.join('meta', 'lib', 'oeqa', 'files'),
100 os.path.join('meta', 'lib', 'oeqa', 'utils'),
101 os.path.join('scripts', 'oe-test'),
98 os.path.join('scripts', 'lib', 'argparse_oe.py'), 102 os.path.join('scripts', 'lib', 'argparse_oe.py'),
99 os.path.join('scripts', 'lib', 'scriptutils.py'), ] 103 os.path.join('scripts', 'lib', 'scriptutils.py'), ]
100 for f in core_files_to_copy: 104
105 for f in files_to_copy:
101 src = os.path.join(corebase_path, f) 106 src = os.path.join(corebase_path, f)
102 dst = os.path.join(export_path, f.split('/', 1)[-1]) 107 dst = os.path.join(export_path, f.split('/', 1)[-1])
103 if os.path.isdir(src): 108 if os.path.isdir(src):
@@ -105,21 +110,18 @@ def copy_needed_files(d, tc):
105 else: 110 else:
106 shutil.copy2(src, dst) 111 shutil.copy2(src, dst)
107 112
108 # layer specific files/dirs 113 # Remove cases and just copy the ones specified
109 layer_files_to_copy = [ os.path.join('lib', 'oeqa', 'core'), 114 cases_path = os.path.join(export_path, 'lib', 'oeqa', 'runtime', 'cases')
110 os.path.join('lib', 'oeqa', 'runtime'), 115 oe.path.remove(cases_path)
111 os.path.join('lib', 'oeqa', 'files'), 116 bb.utils.mkdirhier(cases_path)
112 os.path.join('lib', 'oeqa', 'utils'),] 117 test_paths = get_runtime_paths(d)
113 for layer in bblayers: 118 test_modules = d.getVar('TEST_SUITES').split()
114 meta = os.path.basename(layer) 119 tc.loadTests(test_paths, modules=test_modules)
115 for f in layer_files_to_copy: 120 for f in getSuiteCasesFiles(tc.suites):
116 src = os.path.join(layer, f) 121 shutil.copy2(f, cases_path)
117 dst = os.path.join(export_path, meta, f) 122 json_file = _get_json_file(f)
118 if os.path.exists(src): 123 if json_file:
119 if os.path.isdir(src): 124 shutil.copy2(json_file, cases_path)
120 oe.path.copytree(src, dst)
121 else:
122 shutil.copy2(src, dst)
123 125
124 # Copy test data 126 # Copy test data
125 image_name = ("%s/%s" % (d.getVar('DEPLOY_DIR_IMAGE'), 127 image_name = ("%s/%s" % (d.getVar('DEPLOY_DIR_IMAGE'),
@@ -144,9 +146,6 @@ def copy_needed_files(d, tc):
144 (image_basename, image_machine_suffix), d.getVar("TEST_EXPORT_DIR")) 146 (image_basename, image_machine_suffix), d.getVar("TEST_EXPORT_DIR"))
145 147
146 # Copy packages needed for runtime testing 148 # Copy packages needed for runtime testing
147 test_paths = get_runtime_paths(d)
148 test_modules = d.getVar('TEST_SUITES').split()
149 tc.loadTests(test_paths, modules=test_modules)
150 package_extraction(d, tc.suites) 149 package_extraction(d, tc.suites)
151 test_pkg_dir = d.getVar("TEST_NEEDED_PACKAGES_DIR") 150 test_pkg_dir = d.getVar("TEST_NEEDED_PACKAGES_DIR")
152 if os.path.isdir(test_pkg_dir) and os.listdir(test_pkg_dir): 151 if os.path.isdir(test_pkg_dir) and os.listdir(test_pkg_dir):
diff --git a/meta/recipes-multimedia/libpng/libpng_1.6.49.bb b/meta/recipes-multimedia/libpng/libpng_1.6.48.bb
index c4af30be80..e603df1edd 100644
--- a/meta/recipes-multimedia/libpng/libpng_1.6.49.bb
+++ b/meta/recipes-multimedia/libpng/libpng_1.6.48.bb
@@ -14,7 +14,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BPN}${LIBV}/${BP}.tar.xz \
14 file://run-ptest \ 14 file://run-ptest \
15" 15"
16 16
17SRC_URI[sha256sum] = "43182aa48e39d64b1ab4ec6b71ab3e910b67eed3a0fff3777cf8cf40d6ef7024" 17SRC_URI[sha256sum] = "46fd06ff37db1db64c0dc288d78a3f5efd23ad9ac41561193f983e20937ece03"
18 18
19MIRRORS += "${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}${LIBV}/ ${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}${LIBV}/older-releases/" 19MIRRORS += "${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}${LIBV}/ ${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}${LIBV}/older-releases/"
20 20
diff --git a/scripts/oe-test b/scripts/oe-test
index efb83c3e78..55985b0b24 100755
--- a/scripts/oe-test
+++ b/scripts/oe-test
@@ -7,18 +7,14 @@
7# SPDX-License-Identifier: MIT 7# SPDX-License-Identifier: MIT
8# 8#
9 9
10import argparse
11import glob
12import logging
13import os 10import os
14import sys 11import sys
12import argparse
13import logging
15 14
16scripts_path = os.path.dirname(os.path.realpath(__file__)) 15scripts_path = os.path.dirname(os.path.realpath(__file__))
17lib_path = os.path.join(scripts_path, 'lib') 16lib_path = scripts_path + '/lib'
18sys.path.append(lib_path) 17sys.path = sys.path + [lib_path]
19meta_lib_paths = glob.glob(scripts_path + '/*/lib', root_dir=scripts_path, recursive=True)
20for p in meta_lib_paths:
21 sys.path.append(p)
22import argparse_oe 18import argparse_oe
23import scriptutils 19import scriptutils
24 20