From a923a232d8cb20cd51f12b907dd3b72220019ee5 Mon Sep 17 00:00:00 2001 From: Tim Orling Date: Fri, 16 Feb 2024 16:15:10 -0800 Subject: python3-py-cpuinfo: switch to pytest --automake * Also replace ${PYTHON_PN} with python3 Signed-off-by: Tim Orling Signed-off-by: Khem Raj --- meta-python/recipes-devtools/python/python3-py-cpuinfo/run-ptest | 2 +- meta-python/recipes-devtools/python/python3-py-cpuinfo_9.0.0.bb | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/meta-python/recipes-devtools/python/python3-py-cpuinfo/run-ptest b/meta-python/recipes-devtools/python/python3-py-cpuinfo/run-ptest index b63c4de0d9..8d2017d39c 100644 --- a/meta-python/recipes-devtools/python/python3-py-cpuinfo/run-ptest +++ b/meta-python/recipes-devtools/python/python3-py-cpuinfo/run-ptest @@ -1,3 +1,3 @@ #!/bin/sh -pytest -o log_cli=true -o log_cli_level=INFO | sed -e 's/\[...%\]//g'| sed -e 's/PASSED/PASS/g'| sed -e 's/FAILED/FAIL/g'|sed -e 's/SKIPPED/SKIP/g'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS"){printf "%s: %s\n", $NF, $0}else{print}}'| awk '{if ($NF=="PASS" || $NF=="FAIL" || $NF=="SKIP" || $NF=="XFAIL" || $NF=="XPASS") {$NF="";print $0}else{print}}' +pytest --automake diff --git a/meta-python/recipes-devtools/python/python3-py-cpuinfo_9.0.0.bb b/meta-python/recipes-devtools/python/python3-py-cpuinfo_9.0.0.bb index 84172c058e..857afd1db7 100644 --- a/meta-python/recipes-devtools/python/python3-py-cpuinfo_9.0.0.bb +++ b/meta-python/recipes-devtools/python/python3-py-cpuinfo_9.0.0.bb @@ -17,7 +17,7 @@ SRC_URI += "file://run-ptest \ do_install:append() { # Make sure we use /usr/bin/env python3 for PYTHSCRIPT in `grep -rIl '^#!.*python' ${D}`; do - sed -i -e '1s|^#!.*|#!/usr/bin/env ${PYTHON_PN}|' $PYTHSCRIPT + sed -i -e '1s|^#!.*|#!/usr/bin/env python3|' $PYTHSCRIPT done } @@ -28,6 +28,7 @@ do_install_ptest() { RDEPENDS:${PN}-ptest += "\ python3-pytest \ + python3-unittest-automake-output \ " RDEPENDS:${PN} += "python3-core python3-ctypes python3-datetime python3-json python3-io python3-mmap python3-multiprocessing python3-netclient python3-pickle python3-pprint python3-shell" -- cgit v1.2.3-54-g00ecf