4 files changed, 29 insertions, 33 deletions

diff --git a/bitbake/lib/bb/cooker.py b/bitbake/lib/bb/cooker.py
index 427078df0b..938b999b4f 100644
--- a/bitbake/lib/bb/cooker.py
+++ b/bitbake/lib/bb/cooker.py
@@ -2067,8 +2067,9 @@ class Parser(multiprocessing.Process):
 
                 jobid = None
                 try:
-                    jobid = self.jobid_queue.get(True, 0.5)
-                except (ValueError, OSError):
+                    # Have to wait for all parsers to have forked
+                    jobid = self.jobid_queue.get(True, 5)
+                except (ValueError, OSError, queue.Empty):
                     havejobs = False
 
                 if jobid is not None:
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):
 
     export_path = d.getVar('TEST_EXPORT_DIR')
     corebase_path = d.getVar('COREBASE')
-    bblayers = d.getVar('BBLAYERS').split()
 
     # Clean everything before starting
     oe.path.remove(export_path)
@@ -93,11 +92,17 @@ def copy_needed_files(d, tc):
 
     # The source of files to copy are relative to 'COREBASE' directory
     # The destination is relative to 'TEST_EXPORT_DIR'
-    # core files/dirs first
-    core_files_to_copy = [ os.path.join('scripts', 'oe-test'),
+    # Because we are squashing the libraries, we need to remove
+    # the layer/script directory
+    files_to_copy = [ os.path.join('meta', 'lib', 'oeqa', 'core'),
+                      os.path.join('meta', 'lib', 'oeqa', 'runtime'),
+                      os.path.join('meta', 'lib', 'oeqa', 'files'),
+                      os.path.join('meta', 'lib', 'oeqa', 'utils'),
+                      os.path.join('scripts', 'oe-test'),
                       os.path.join('scripts', 'lib', 'argparse_oe.py'),
                       os.path.join('scripts', 'lib', 'scriptutils.py'), ]
-    for f in core_files_to_copy:
+
+    for f in files_to_copy:
         src = os.path.join(corebase_path, f)
         dst = os.path.join(export_path, f.split('/', 1)[-1])
         if os.path.isdir(src):
@@ -105,21 +110,18 @@ def copy_needed_files(d, tc):
         else:
             shutil.copy2(src, dst)
 
-    # layer specific files/dirs
-    layer_files_to_copy = [ os.path.join('lib', 'oeqa', 'core'),
-                      os.path.join('lib', 'oeqa', 'runtime'),
-                      os.path.join('lib', 'oeqa', 'files'),
-                      os.path.join('lib', 'oeqa', 'utils'),]
-    for layer in bblayers:
-        meta = os.path.basename(layer)
-        for f in layer_files_to_copy:
-            src = os.path.join(layer, f)
-            dst = os.path.join(export_path, meta, f)
-            if os.path.exists(src):
-                if os.path.isdir(src):
-                    oe.path.copytree(src, dst)
-                else:
-                    shutil.copy2(src, dst)
+    # Remove cases and just copy the ones specified
+    cases_path = os.path.join(export_path, 'lib', 'oeqa', 'runtime', 'cases')
+    oe.path.remove(cases_path)
+    bb.utils.mkdirhier(cases_path)
+    test_paths = get_runtime_paths(d)
+    test_modules = d.getVar('TEST_SUITES').split()
+    tc.loadTests(test_paths, modules=test_modules)
+    for f in getSuiteCasesFiles(tc.suites):
+        shutil.copy2(f, cases_path)
+        json_file = _get_json_file(f)
+        if json_file:
+            shutil.copy2(json_file, cases_path)
 
     # Copy test data
     image_name = ("%s/%s" % (d.getVar('DEPLOY_DIR_IMAGE'),
@@ -144,9 +146,6 @@ def copy_needed_files(d, tc):
         (image_basename, image_machine_suffix), d.getVar("TEST_EXPORT_DIR"))
 
     # Copy packages needed for runtime testing
-    test_paths = get_runtime_paths(d)
-    test_modules = d.getVar('TEST_SUITES').split()
-    tc.loadTests(test_paths, modules=test_modules)
     package_extraction(d, tc.suites)
     test_pkg_dir = d.getVar("TEST_NEEDED_PACKAGES_DIR")
     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 \
            file://run-ptest \
 "
 
-SRC_URI[sha256sum] = "43182aa48e39d64b1ab4ec6b71ab3e910b67eed3a0fff3777cf8cf40d6ef7024"
+SRC_URI[sha256sum] = "46fd06ff37db1db64c0dc288d78a3f5efd23ad9ac41561193f983e20937ece03"
 
 MIRRORS += "${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}${LIBV}/ ${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}${LIBV}/older-releases/"
 
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 @@
 # SPDX-License-Identifier: MIT
 #
 
-import argparse
-import glob
-import logging
 import os
 import sys
+import argparse
+import logging
 
 scripts_path = os.path.dirname(os.path.realpath(__file__))
-lib_path = os.path.join(scripts_path, 'lib')
-sys.path.append(lib_path)
-meta_lib_paths = glob.glob(scripts_path + '/*/lib', root_dir=scripts_path, recursive=True)
-for p in meta_lib_paths:
-    sys.path.append(p)
+lib_path = scripts_path + '/lib'
+sys.path = sys.path + [lib_path]
 import argparse_oe
 import scriptutils