[PATCH 2/3] ptests: Update references to new ptest-runner2.

Aníbal Limón
2016-01-14T22:25:24Z

classes/ptest.bbclass: Now recommends ptest-runner2 instead of
ptest-runner.
oeqa/runtime/_ptest.py: Now validate if ptest-runner2 is installed.

Signed-off-by: Aníbal Limón <anibal.limon@linux.intel.com>
---
meta/classes/ptest.bbclass | 2 +-
meta/lib/oeqa/runtime/_ptest.py | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/meta/classes/ptest.bbclass b/meta/classes/ptest.bbclass
index fa3561e..c84ca97 100644
--- a/meta/classes/ptest.bbclass
+++ b/meta/classes/ptest.bbclass
@@ -12,7 +12,7 @@ PTEST_ENABLED_class-nativesdk = ""
PTEST_ENABLED_class-cross-canadian = ""
RDEPENDS_${PN}-ptest_class-native = ""
RDEPENDS_${PN}-ptest_class-nativesdk = ""
-RRECOMMENDS_${PN}-ptest += "ptest-runner"
+RRECOMMENDS_${PN}-ptest += "ptest-runner2"

PACKAGES =+ "${@bb.utils.contains('PTEST_ENABLED', '1', '${PN}-ptest', '', d)}"

diff --git a/meta/lib/oeqa/runtime/_ptest.py b/meta/lib/oeqa/runtime/_ptest.py
index 0621028..d1e51a4 100644
--- a/meta/lib/oeqa/runtime/_ptest.py
+++ b/meta/lib/oeqa/runtime/_ptest.py
@@ -105,10 +105,10 @@ class PtestRunnerTest(oeRuntimeTest):
def test_ptestrunner(self):
self.add_smart_channel()
(runnerstatus, result) = self.target.run('which ptest-runner', 0)
- cond = oeRuntimeTest.hasPackage("ptest-runner") and oeRuntimeTest.hasFeature("ptest") and oeRuntimeTest.hasPackage("-ptest") and (runnerstatus != 0)
+ cond = oeRuntimeTest.hasPackage("ptest-runner2") and oeRuntimeTest.hasFeature("ptest") and oeRuntimeTest.hasPackage("-ptest") and (runnerstatus != 0)
if cond:
self.install_packages(self.install_complementary("*-ptest"))
- self.install_packages(['ptest-runner'])
+ self.install_packages(['ptest-runner2'])

(runnerstatus, result) = self.target.run('/usr/bin/ptest-runner > /tmp/ptest.log 2>&1', 0)
#exit code is !=0 even if ptest-runner executes because some ptest tests fail.
--
2.1.4