rt-tests: move ptest to python3

convert python2 based ptest of rt-tests package to python3

Signed-off-by: Maxin B. John <maxin.john@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>

diff --git a/meta/recipes-rt/rt-tests/files/rt_bmark.py b/meta/recipes-rt/rt-tests/files/rt_bmark.py
index 0e2b105e3472ae9176b5b5df976bca1b7ec12b45..080a65589350bc2965a6fb82800df9947fe53f00 100755 (executable)
--- 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 8e6d3e35887dee3520dd9ed446dd01960106a7bd..b7c5e29f2a3c28ddc5f78de364cfcf54df2dfa56 100644 (file)
--- 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 21780d19edd1dff6fa9cf3d5ea631ef9afc804cf..83869b89b8387c283d48863027841a1a9d888b52 100644 (file)
--- 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"