5 files changed, 25 insertions, 5 deletions

diff --git a/meta/lib/oeqa/runtime/cases/stap.py b/meta/lib/oeqa/runtime/cases/stap.py
index 6b55e7de50..d83cb0b2b8 100644
--- a/meta/lib/oeqa/runtime/cases/stap.py
+++ b/meta/lib/oeqa/runtime/cases/stap.py
@@ -16,8 +16,12 @@ class StapTest(OERuntimeTestCase):
     @OEHasPackage(['gcc-symlinks'])
     @OEHasPackage(['kernel-devsrc'])
     def test_stap(self):
+        from oe.utils import parallel_make_value
+        pmv = parallel_make_value((self.td.get('PARALLEL_MAKE') or '').split())
+        parallel_make = "-j %d" % (pmv) if pmv else ""
+
         try:
-            cmd = 'make -j -C /usr/src/kernel scripts prepare'
+            cmd = 'make %s -C /usr/src/kernel scripts prepare' % (parallel_make)
             status, output = self.target.run(cmd, 900)
             self.assertEqual(status, 0, msg='\n'.join([cmd, output]))
 
diff --git a/meta/lib/oeqa/sdk/cases/autotools.py b/meta/lib/oeqa/sdk/cases/autotools.py
index f641d66015..3f51854e3d 100644
--- a/meta/lib/oeqa/sdk/cases/autotools.py
+++ b/meta/lib/oeqa/sdk/cases/autotools.py
@@ -23,6 +23,9 @@ class AutotoolsTest(OESDKTestCase):
             raise unittest.SkipTest("AutotoolsTest class: SDK doesn't contain a supported C library")
 
     def test_cpio(self):
+        from oe.utils import parallel_make_value
+        pmv = parallel_make_value((self.td.get('PARALLEL_MAKE') or '').split())
+
         with tempfile.TemporaryDirectory(prefix="cpio-", dir=self.tc.sdk_dir) as testdir:
             tarball = self.fetch(testdir, self.td["DL_DIR"], "https://ftp.gnu.org/gnu/cpio/cpio-2.15.tar.gz")
 
@@ -30,6 +33,7 @@ class AutotoolsTest(OESDKTestCase):
             opts["source"] = os.path.join(testdir, "cpio-2.15")
             opts["build"] = os.path.join(testdir, "build")
             opts["install"] = os.path.join(testdir, "install")
+            opts["parallel_make"] = "-j %d" % (pmv) if pmv else ""
 
             subprocess.check_output(["tar", "xf", tarball, "-C", testdir], stderr=subprocess.STDOUT)
             self.assertTrue(os.path.isdir(opts["source"]))
@@ -42,7 +46,7 @@ class AutotoolsTest(OESDKTestCase):
                 host_sys = self.td["HOST_SYS"]
                 self.assertIn(f"host_alias='{host_sys}'\n", f.readlines())
 
-            self._run("cd {build} && make CFLAGS='-std=gnu17 -Dbool=int -Dtrue=1 -Dfalse=0 -Wno-error=implicit-function-declaration' -j".format(**opts))
+            self._run("cd {build} && make CFLAGS='-std=gnu17 -Dbool=int -Dtrue=1 -Dfalse=0 -Wno-error=implicit-function-declaration' {parallel_make}".format(**opts))
             self._run("cd {build} && make install DESTDIR={install}".format(**opts))
 
             self.check_elf(os.path.join(opts["install"], "usr", "local", "bin", "cpio"))
diff --git a/meta/lib/oeqa/sdk/cases/cmake.py b/meta/lib/oeqa/sdk/cases/cmake.py
index 32b951c0f8..81fd327ca3 100644
--- a/meta/lib/oeqa/sdk/cases/cmake.py
+++ b/meta/lib/oeqa/sdk/cases/cmake.py
@@ -26,6 +26,9 @@ class CMakeTest(OESDKTestCase):
         self.ensure_host_package("cmake")
 
     def test_assimp(self):
+        from oe.utils import parallel_make_value
+        pmv = parallel_make_value((self.td.get('PARALLEL_MAKE') or '').split())
+
         with tempfile.TemporaryDirectory(prefix="assimp", dir=self.tc.sdk_dir) as testdir:
             tarball = self.fetch(testdir, self.td["DL_DIR"], "https://github.com/assimp/assimp/archive/v5.4.1.tar.gz")
 
@@ -33,6 +36,7 @@ class CMakeTest(OESDKTestCase):
             opts["source"] = os.path.join(testdir, "assimp-5.4.1")
             opts["build"] = os.path.join(testdir, "build")
             opts["install"] = os.path.join(testdir, "install")
+            opts["parallel_make"] = "-j %d" % (pmv) if pmv else ""
 
             subprocess.check_output(["tar", "xf", tarball, "-C", testdir], stderr=subprocess.STDOUT)
             self.assertTrue(os.path.isdir(opts["source"]))
@@ -42,6 +46,6 @@ class CMakeTest(OESDKTestCase):
             os.makedirs(opts["build"])
 
             self._run("cd {build} && cmake -DASSIMP_WARNINGS_AS_ERRORS=OFF -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DASSIMP_BUILD_ZLIB=ON {source}".format(**opts))
-            self._run("cmake --build {build} -- -j".format(**opts))
+            self._run("cmake --build {build} -- {parallel_make}".format(**opts))
             self._run("cmake --build {build} --target install -- DESTDIR={install}".format(**opts))
             self.check_elf(os.path.join(opts["install"], "usr", "local", "lib", "libassimp.so.5.4.1"))
diff --git a/meta/lib/oeqa/sdk/cases/kmod.py b/meta/lib/oeqa/sdk/cases/kmod.py
index 0aa6f702e4..0c4d8ddb54 100644
--- a/meta/lib/oeqa/sdk/cases/kmod.py
+++ b/meta/lib/oeqa/sdk/cases/kmod.py
@@ -21,9 +21,13 @@ class KernelModuleTest(OESDKTestCase):
         if isinstance(self.tc, OESDKExtTestContext):
             self.skipTest(f"{self.id()} does not support eSDK (https://bugzilla.yoctoproject.org/show_bug.cgi?id=15850)")
 
+        from oe.utils import parallel_make_value
+        pmv = parallel_make_value((self.td.get('PARALLEL_MAKE') or '').split())
+        parallel_make = "-j %d" % (pmv) if pmv else ""
+
         self.ensure_target_package("kernel-devsrc")
         # These targets need to be built before kernel modules can be built.
-        self._run("make -j -C $OECORE_TARGET_SYSROOT/usr/src/kernel prepare scripts")
+        self._run("make %s -C $OECORE_TARGET_SYSROOT/usr/src/kernel prepare scripts" % (parallel_make))
 
         with tempfile.TemporaryDirectory(prefix="cryptodev", dir=self.tc.sdk_dir) as testdir:
             git_url = "https://github.com/cryptodev-linux/cryptodev-linux"
diff --git a/meta/lib/oeqa/sdk/cases/makefile.py b/meta/lib/oeqa/sdk/cases/makefile.py
index 0dcf94c6d7..fc041ca8d8 100644
--- a/meta/lib/oeqa/sdk/cases/makefile.py
+++ b/meta/lib/oeqa/sdk/cases/makefile.py
@@ -20,6 +20,9 @@ class MakefileTest(OESDKTestCase):
             raise unittest.SkipTest("MakefileTest class: SDK doesn't contain a supported C library")
 
     def test_lzip(self):
+        from oe.utils import parallel_make_value
+        pmv = parallel_make_value((self.td.get('PARALLEL_MAKE') or '').split())
+
         with tempfile.TemporaryDirectory(prefix="lzip", dir=self.tc.sdk_dir) as testdir:
             tarball = self.fetch(testdir, self.td["DL_DIR"], "http://downloads.yoctoproject.org/mirror/sources/lzip-1.19.tar.gz")
 
@@ -27,6 +30,7 @@ class MakefileTest(OESDKTestCase):
             opts["source"] = os.path.join(testdir, "lzip-1.19")
             opts["build"] = os.path.join(testdir, "build")
             opts["install"] = os.path.join(testdir, "install")
+            opts["parallel_make"] = "-j %d" % (pmv) if pmv else ""
 
             subprocess.check_output(["tar", "xf", tarball, "-C", testdir], stderr=subprocess.STDOUT)
             self.assertTrue(os.path.isdir(opts["source"]))
@@ -40,6 +44,6 @@ class MakefileTest(OESDKTestCase):
                      LDFLAGS="$LDFLAGS" \
                   """
             self._run(cmd.format(**opts))
-            self._run("cd {build} && make -j".format(**opts))
+            self._run("cd {build} && make {parallel_make}".format(**opts))
             self._run("cd {build} && make install DESTDIR={install}".format(**opts))
             self.check_elf(os.path.join(opts["install"], "usr", "local", "bin", "lzip"))