summaryrefslogtreecommitdiffstats
path: root/meta/lib/oeqa/runtime
diff options
context:
space:
mode:
Diffstat (limited to 'meta/lib/oeqa/runtime')
-rw-r--r--meta/lib/oeqa/runtime/cases/buildcvs.py11
-rw-r--r--meta/lib/oeqa/runtime/cases/buildgalculator.py7
-rw-r--r--meta/lib/oeqa/runtime/cases/buildiptables.py11
-rw-r--r--meta/lib/oeqa/runtime/utils/targetbuildproject.py6
4 files changed, 13 insertions, 22 deletions
diff --git a/meta/lib/oeqa/runtime/cases/buildcvs.py b/meta/lib/oeqa/runtime/cases/buildcvs.py
index 341eb4959d..c3f3acc736 100644
--- a/meta/lib/oeqa/runtime/cases/buildcvs.py
+++ b/meta/lib/oeqa/runtime/cases/buildcvs.py
@@ -25,11 +25,6 @@ class BuildCvsTest(OERuntimeTestCase):
25 'Test requires tools-sdk to be in IMAGE_FEATURES') 25 'Test requires tools-sdk to be in IMAGE_FEATURES')
26 @OETestDepends(['ssh.SSHTest.test_ssh']) 26 @OETestDepends(['ssh.SSHTest.test_ssh'])
27 def test_cvs(self): 27 def test_cvs(self):
28 self.assertEqual(self.project.run_configure(), 0, 28 self.project.run_configure()
29 msg="Running configure failed") 29 self.project.run_make()
30 30 self.project.run_install()
31 self.assertEqual(self.project.run_make(), 0,
32 msg="Running make failed")
33
34 self.assertEqual(self.project.run_install(), 0,
35 msg="Running make install failed")
diff --git a/meta/lib/oeqa/runtime/cases/buildgalculator.py b/meta/lib/oeqa/runtime/cases/buildgalculator.py
index 0bd76f9ea2..7c9d4a392b 100644
--- a/meta/lib/oeqa/runtime/cases/buildgalculator.py
+++ b/meta/lib/oeqa/runtime/cases/buildgalculator.py
@@ -24,8 +24,5 @@ class GalculatorTest(OERuntimeTestCase):
24 'Test requires tools-sdk to be in IMAGE_FEATURES') 24 'Test requires tools-sdk to be in IMAGE_FEATURES')
25 @OETestDepends(['ssh.SSHTest.test_ssh']) 25 @OETestDepends(['ssh.SSHTest.test_ssh'])
26 def test_galculator(self): 26 def test_galculator(self):
27 self.assertEqual(self.project.run_configure(), 0, 27 self.project.run_configure()
28 msg="Running configure failed") 28 self.project.run_make()
29
30 self.assertEqual(self.project.run_make(), 0,
31 msg="Running make failed")
diff --git a/meta/lib/oeqa/runtime/cases/buildiptables.py b/meta/lib/oeqa/runtime/cases/buildiptables.py
index bae80392d9..002b16c483 100644
--- a/meta/lib/oeqa/runtime/cases/buildiptables.py
+++ b/meta/lib/oeqa/runtime/cases/buildiptables.py
@@ -25,14 +25,9 @@ class BuildIptablesTest(OERuntimeTestCase):
25 'Test requires tools-sdk to be in IMAGE_FEATURES') 25 'Test requires tools-sdk to be in IMAGE_FEATURES')
26 @OETestDepends(['ssh.SSHTest.test_ssh']) 26 @OETestDepends(['ssh.SSHTest.test_ssh'])
27 def test_iptables(self): 27 def test_iptables(self):
28 self.assertEqual(self.project.run_configure(), 0, 28 self.project.run_configure()
29 msg="Running configure failed") 29 self.project.run_make()
30 30 self.project.run_install()
31 self.assertEqual(self.project.run_make(), 0,
32 msg="Running make failed")
33
34 self.assertEqual(self.project.run_install(), 0,
35 msg="Running make install failed")
36 31
37 @classmethod 32 @classmethod
38 def tearDownClass(self): 33 def tearDownClass(self):
diff --git a/meta/lib/oeqa/runtime/utils/targetbuildproject.py b/meta/lib/oeqa/runtime/utils/targetbuildproject.py
index 1ed5789ae5..551b0b6f27 100644
--- a/meta/lib/oeqa/runtime/utils/targetbuildproject.py
+++ b/meta/lib/oeqa/runtime/utils/targetbuildproject.py
@@ -33,4 +33,8 @@ class TargetBuildProject(BuildProject):
33 # The timeout parameter of target.run is set to 0 33 # The timeout parameter of target.run is set to 0
34 # to make the ssh command run with no timeout. 34 # to make the ssh command run with no timeout.
35 def _run(self, cmd): 35 def _run(self, cmd):
36 return self.target.run(cmd, 0)[0] 36 ret = self.target.run(cmd, 0)
37 msg = "Command %s failed with exit code %s: %s" % (cmd, ret[0], ret[1])
38 if ret[0] != 0:
39 raise Exception(msg)
40 return ret[0]