[yocto] [PATCH v4][yocto-autobuilder] RunOeSelftest.py: changed to new oe-selftest syntax
Humberto Ibarra
humberto.ibarra.lopez at intel.com
Fri Sep 2 08:18:31 PDT 2016
oe-selftest is changing syntax with YOCTO #8938. This patch checks the correct syntax version and uses the right command to avoid breaking oe-seltest autobuilder.
[YOCTO #8938]
Signed-off-by: Humberto Ibarra <humberto.ibarra.lopez at intel.com>
---
.../autobuilder/buildsteps/RunOeSelftest.py | 16 ++++++++++++++--
1 file changed, 14 insertions(+), 2 deletions(-)
diff --git a/lib/python2.7/site-packages/autobuilder/buildsteps/RunOeSelftest.py b/lib/python2.7/site-packages/autobuilder/buildsteps/RunOeSelftest.py
index 84d32fe..18629f0 100644
--- a/lib/python2.7/site-packages/autobuilder/buildsteps/RunOeSelftest.py
+++ b/lib/python2.7/site-packages/autobuilder/buildsteps/RunOeSelftest.py
@@ -33,9 +33,21 @@ class RunOeSelftest(ShellCommand):
self.command += ". ./oe-init-build-env; "
self.command += "checkvnc; "
if self.tests == None:
- self.command += "if [ -d ../meta-selftest ]; then export DISPLAY=:1; oe-selftest --run-all-tests; else echo 'Skipping step - no meta-selftest layer here'; fi"
+ oe_selftest_cmd = ("run","--run-all-tests")
else:
- self.command += "if [ -d ../meta-selftest ]; then export DISPLAY=:1; oe-selftest " + self.tests + "; else echo 'Skipping step - no meta-selftest layer here'; fi"
+ oe_selftest_cmd = ("run --tests %s" % self.tests, "--run-tests %s" % self.tests)
+ self.command += """ \
+if [ -d ../meta-selftest ]; then \
+ export DISPLAY=:1; \
+ VERSION=$(oe-selftest --version 2> /dev/null | cut -d' ' -f2); \
+ if [ \"$VERSION\" == '2.0' ]; then \
+ oe-selftest %s; \
+ else \
+ oe-selftest %s; \
+ fi; \
+else \
+ echo 'Skipping step - no meta-selftest layer here';
+fi""" % oe_selftest_cmd
ShellCommand.start(self)
def _createOESelftestErrorReport(self, log):
--
2.4.11
More information about the yocto
mailing list