[OE-core] [oe-commits] [openembedded-core] 21/28: rt-tests: move ptest to python3

[Martin Jansa]

Any idea why it fails now like this:

http://errors.yoctoproject.org/Errors/Details/73086/

?

On Fri, Jul 08, 2016 at 08:59:33AM +0000, git at git.openembedded.org wrote:
> rpurdie pushed a commit to branch master
> in repository openembedded-core.
> 
> commit 2767cbe014f84c9ad42ed8ef1eca7caa862e5196
> Author: Maxin B. John <maxin.john at intel.com>
> AuthorDate: Fri Jul 1 11:39:02 2016 +0300
> 
>     rt-tests: move ptest to python3
>     
>     convert python2 based ptest of rt-tests package to python3
>     
>     Signed-off-by: Maxin B. John <maxin.john at intel.com>
>     Signed-off-by: Ross Burton <ross.burton at intel.com>
> ---
>  meta/recipes-rt/rt-tests/files/rt_bmark.py | 26 +++++++++++++-------------
>  meta/recipes-rt/rt-tests/files/run-ptest   |  2 +-
>  meta/recipes-rt/rt-tests/rt-tests_2.0.bb   |  2 +-
>  3 files changed, 15 insertions(+), 15 deletions(-)
> 
> diff --git a/meta/recipes-rt/rt-tests/files/rt_bmark.py b/meta/recipes-rt/rt-tests/files/rt_bmark.py
> index 0e2b105..080a655 100755
> --- a/meta/recipes-rt/rt-tests/files/rt_bmark.py
> +++ b/meta/recipes-rt/rt-tests/files/rt_bmark.py
> @@ -1,4 +1,4 @@
> -#!/usr/bin/python
> +#!/usr/bin/env python3
>  # -*- coding: utf-8 -*-
>  
>  # SPDX-License-Identifier:     BSD-3-Clause
> @@ -106,8 +106,8 @@ def tc_name(sub_name):
>  
>  def log(*msg):
>          tmp = "".join(map(str, msg)) # 'map(str, ...' allows numbers
> -        for line in tmp.split("\n"):
> -                print "#", line
> +        for line in tmp.splitlines():
> +                print("#", line)
>  
>  #-------------------------------------------------------------------------------
>  # Like log(), but with a timestamp added
> @@ -265,7 +265,7 @@ cmd = ("cyclictest",
>         "-d", str(interval_delta),
>         "-l", str(loop_count)
>         )
> -rex = re.compile("C:\s*(\d+).*Min:\s*(\d+).*Avg:\s*(\d+).*Max:\s*(\d+)")
> +rex = re.compile(b"C:\s*(\d+).*Min:\s*(\d+).*Avg:\s*(\d+).*Max:\s*(\d+)")
>  
>  def run_cyclictest_once():
>          res = subprocess.check_output(cmd)
> @@ -283,7 +283,7 @@ def run_cyclictest_once():
>          avg_sum = 0
>          avg_cnt = 0
>  
> -        for line in res.split("\n"):
> +        for line in res.splitlines():
>                  m = rex.search(line)
>                  if m is not None:
>                          minlist.append(int(m.group(2)))
> @@ -376,11 +376,11 @@ class cyclictest_runner:
>                          log()
>                          log("PASS")
>  
> -                        print
> -                        print tc_name(name), "[Min/us,Avg/us,Max/us]:",
> -                        print "%d,%.1f,%d" % (bm_min,bm_avg, bm_max)
> -                        print "PASS:", tc_name(name)
> -                        print
> +                        print()
> +                        print(tc_name(name), "[Min/us,Avg/us,Max/us]:",)
> +                        print("%d,%.1f,%d" % (bm_min,bm_avg, bm_max))
> +                        print("PASS:", tc_name(name))
> +                        print()
>  
>                  except Exception:
>                          log()
> @@ -391,9 +391,9 @@ class cyclictest_runner:
>                          log("WD: ", os.getcwd())
>                          log()
>                          log("FAIL")
> -                        print
> -                        print "FAIL:", tc_name(name)
> -                        print
> +                        print()
> +                        print("FAIL:", tc_name(name))
> +                        print()
>  
>  #-------------------------------------------------------------------------------
>  
> diff --git a/meta/recipes-rt/rt-tests/files/run-ptest b/meta/recipes-rt/rt-tests/files/run-ptest
> index 8e6d3e3..b7c5e29 100644
> --- a/meta/recipes-rt/rt-tests/files/run-ptest
> +++ b/meta/recipes-rt/rt-tests/files/run-ptest
> @@ -1,3 +1,3 @@
>  #!/bin/sh
>  
> -python ./rt_bmark.py
> +python3 ./rt_bmark.py
> diff --git a/meta/recipes-rt/rt-tests/rt-tests_2.0.bb b/meta/recipes-rt/rt-tests/rt-tests_2.0.bb
> index 21780d1..83869b8 100644
> --- a/meta/recipes-rt/rt-tests/rt-tests_2.0.bb
> +++ b/meta/recipes-rt/rt-tests/rt-tests_2.0.bb
> @@ -28,6 +28,6 @@ do_install_ptest() {
>          cp ${WORKDIR}/rt_bmark.py ${D}${PTEST_PATH}
>  }
>  
> -RDEPENDS_${PN}-ptest += " stress python python-subprocess python-multiprocessing python-datetime python-re python-lang"
> +RDEPENDS_${PN}-ptest += " stress python3 python3-subprocess python3-multiprocessing python3-datetime python3-re python3-lang python3-misc"
>  
>  FILES_${PN} += "${prefix}/src/backfire"
> 
> -- 
> To stop receiving notification emails like this one, please contact
> the administrator of this repository.
> -- 
> _______________________________________________
> Openembedded-commits mailing list
> Openembedded-commits at lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-commits

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa at gmail.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 181 bytes
Desc: Digital signature
URL: <http://lists.openembedded.org/pipermail/openembedded-core/attachments/20160724/987d295c/attachment-0002.sig>