summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoshua Watt <JPEWhacker@gmail.com>2020-08-31 16:53:53 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-09-10 19:07:40 +0100
commit1f42bb0cb08a649acc59d372fbc1b2729129ec34 (patch)
tree335c5d851e430a83d6b787499c81de0c05257c18
parent2d2836527ca1417aecb74d6faefa5229345c512c (diff)
downloadpoky-1f42bb0cb08a649acc59d372fbc1b2729129ec34.tar.gz
oeqa: sdk: Capture stderr output
Redirect stderr to stdout when running subcommands while doing the SDK tests. The tests will show stdout when CalledProcessError is raised, but any output to stderr was lost. (From OE-Core rev: cf6cab12ca7ff40ac484cdaf27ea91ed49b901b0) Signed-off-by: Joshua Watt <JPEWhacker@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit 7cb4e9ab8c1596281060e94a216966060103956e) Signed-off-by: Steve Sakoman <steve@sakoman.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/lib/oeqa/sdk/case.py2
-rw-r--r--meta/lib/oeqa/sdk/cases/assimp.py2
-rw-r--r--meta/lib/oeqa/sdk/cases/buildcpio.py2
-rw-r--r--meta/lib/oeqa/sdk/cases/buildepoxy.py2
-rw-r--r--meta/lib/oeqa/sdk/cases/buildgalculator.py2
-rw-r--r--meta/lib/oeqa/sdk/cases/buildlzip.py2
6 files changed, 6 insertions, 6 deletions
diff --git a/meta/lib/oeqa/sdk/case.py b/meta/lib/oeqa/sdk/case.py
index ebb03af9eb..c45882689c 100644
--- a/meta/lib/oeqa/sdk/case.py
+++ b/meta/lib/oeqa/sdk/case.py
@@ -26,7 +26,7 @@ class OESDKTestCase(OETestCase):
26 return tarball 26 return tarball
27 27
28 tarball = os.path.join(workdir, archive) 28 tarball = os.path.join(workdir, archive)
29 subprocess.check_output(["wget", "-O", tarball, url]) 29 subprocess.check_output(["wget", "-O", tarball, url], stderr=subprocess.STDOUT)
30 return tarball 30 return tarball
31 31
32 def check_elf(self, path, target_os=None, target_arch=None): 32 def check_elf(self, path, target_os=None, target_arch=None):
diff --git a/meta/lib/oeqa/sdk/cases/assimp.py b/meta/lib/oeqa/sdk/cases/assimp.py
index f26b17f2e9..f166758e49 100644
--- a/meta/lib/oeqa/sdk/cases/assimp.py
+++ b/meta/lib/oeqa/sdk/cases/assimp.py
@@ -30,7 +30,7 @@ class BuildAssimp(OESDKTestCase):
30 dirs["build"] = os.path.join(testdir, "build") 30 dirs["build"] = os.path.join(testdir, "build")
31 dirs["install"] = os.path.join(testdir, "install") 31 dirs["install"] = os.path.join(testdir, "install")
32 32
33 subprocess.check_output(["tar", "xf", tarball, "-C", testdir]) 33 subprocess.check_output(["tar", "xf", tarball, "-C", testdir], stderr=subprocess.STDOUT)
34 self.assertTrue(os.path.isdir(dirs["source"])) 34 self.assertTrue(os.path.isdir(dirs["source"]))
35 os.makedirs(dirs["build"]) 35 os.makedirs(dirs["build"])
36 36
diff --git a/meta/lib/oeqa/sdk/cases/buildcpio.py b/meta/lib/oeqa/sdk/cases/buildcpio.py
index 902e93f623..681d0e750d 100644
--- a/meta/lib/oeqa/sdk/cases/buildcpio.py
+++ b/meta/lib/oeqa/sdk/cases/buildcpio.py
@@ -24,7 +24,7 @@ class BuildCpioTest(OESDKTestCase):
24 dirs["build"] = os.path.join(testdir, "build") 24 dirs["build"] = os.path.join(testdir, "build")
25 dirs["install"] = os.path.join(testdir, "install") 25 dirs["install"] = os.path.join(testdir, "install")
26 26
27 subprocess.check_output(["tar", "xf", tarball, "-C", testdir]) 27 subprocess.check_output(["tar", "xf", tarball, "-C", testdir], stderr=subprocess.STDOUT)
28 self.assertTrue(os.path.isdir(dirs["source"])) 28 self.assertTrue(os.path.isdir(dirs["source"]))
29 os.makedirs(dirs["build"]) 29 os.makedirs(dirs["build"])
30 30
diff --git a/meta/lib/oeqa/sdk/cases/buildepoxy.py b/meta/lib/oeqa/sdk/cases/buildepoxy.py
index 4211955f8d..385f8ccca8 100644
--- a/meta/lib/oeqa/sdk/cases/buildepoxy.py
+++ b/meta/lib/oeqa/sdk/cases/buildepoxy.py
@@ -28,7 +28,7 @@ class EpoxyTest(OESDKTestCase):
28 dirs["build"] = os.path.join(testdir, "build") 28 dirs["build"] = os.path.join(testdir, "build")
29 dirs["install"] = os.path.join(testdir, "install") 29 dirs["install"] = os.path.join(testdir, "install")
30 30
31 subprocess.check_output(["tar", "xf", tarball, "-C", testdir]) 31 subprocess.check_output(["tar", "xf", tarball, "-C", testdir], stderr=subprocess.STDOUT)
32 self.assertTrue(os.path.isdir(dirs["source"])) 32 self.assertTrue(os.path.isdir(dirs["source"]))
33 os.makedirs(dirs["build"]) 33 os.makedirs(dirs["build"])
34 34
diff --git a/meta/lib/oeqa/sdk/cases/buildgalculator.py b/meta/lib/oeqa/sdk/cases/buildgalculator.py
index bbaa5c55c9..4d85adcaf1 100644
--- a/meta/lib/oeqa/sdk/cases/buildgalculator.py
+++ b/meta/lib/oeqa/sdk/cases/buildgalculator.py
@@ -31,7 +31,7 @@ class GalculatorTest(OESDKTestCase):
31 dirs["build"] = os.path.join(testdir, "build") 31 dirs["build"] = os.path.join(testdir, "build")
32 dirs["install"] = os.path.join(testdir, "install") 32 dirs["install"] = os.path.join(testdir, "install")
33 33
34 subprocess.check_output(["tar", "xf", tarball, "-C", testdir]) 34 subprocess.check_output(["tar", "xf", tarball, "-C", testdir], stderr=subprocess.STDOUT)
35 self.assertTrue(os.path.isdir(dirs["source"])) 35 self.assertTrue(os.path.isdir(dirs["source"]))
36 os.makedirs(dirs["build"]) 36 os.makedirs(dirs["build"])
37 37
diff --git a/meta/lib/oeqa/sdk/cases/buildlzip.py b/meta/lib/oeqa/sdk/cases/buildlzip.py
index 515acd2891..49ae756bf3 100644
--- a/meta/lib/oeqa/sdk/cases/buildlzip.py
+++ b/meta/lib/oeqa/sdk/cases/buildlzip.py
@@ -20,7 +20,7 @@ class BuildLzipTest(OESDKTestCase):
20 dirs["build"] = os.path.join(testdir, "build") 20 dirs["build"] = os.path.join(testdir, "build")
21 dirs["install"] = os.path.join(testdir, "install") 21 dirs["install"] = os.path.join(testdir, "install")
22 22
23 subprocess.check_output(["tar", "xf", tarball, "-C", testdir]) 23 subprocess.check_output(["tar", "xf", tarball, "-C", testdir], stderr=subprocess.STDOUT)
24 self.assertTrue(os.path.isdir(dirs["source"])) 24 self.assertTrue(os.path.isdir(dirs["source"]))
25 os.makedirs(dirs["build"]) 25 os.makedirs(dirs["build"])
26 26