diff mbox series

[yocto-autobuilder-helper] config.json/scripts: Fix toaster execution with bitbake-setup

Message ID 20251016121343.959160-1-richard.purdie@linuxfoundation.org
State New
Headers show
Series [yocto-autobuilder-helper] config.json/scripts: Fix toaster execution with bitbake-setup | expand

Commit Message

Richard Purdie Oct. 16, 2025, 12:13 p.m. UTC 
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 config.json               |  2 +-
 scripts/run-toaster-tests | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)
diff mbox series

Patch

diff --git a/config.json b/config.json
index 00da369..ce019ae 100644
--- a/config.json
+++ b/config.json
@@ -1776,7 +1776,7 @@ 
 	    ]
 	},
         "toaster" : {
-            "EXTRACMDS" : ["${SCRIPTSDIR}/run-toaster-tests ${HELPERBUILDDIR} ${HELPERBUILDDIR}/.."]
+            "EXTRACMDS" : ["${SCRIPTSDIR}/run-toaster-tests ${HELPERBUILDDIR} ${HELPERBUILDDIR}/../layers/bitbake"]
         }
     },
     "repo-defaults" : {
diff --git a/scripts/run-toaster-tests b/scripts/run-toaster-tests
index 014c714..de056d0 100755
--- a/scripts/run-toaster-tests
+++ b/scripts/run-toaster-tests
@@ -3,7 +3,7 @@ 
 # SPDX-License-Identifier: GPL-2.0-only
 #
 # Called with $1 as the build directory
-#             $2 as the path to poky
+#             $2 as the path to bitbake
 
 set -e
 set -u
@@ -11,7 +11,7 @@  set -o pipefail
 set -x
 
 builddir=$(realpath "$1")
-pokydir=$(realpath "$2")
+bitbakedir=$(realpath "$2")
 
 cd $builddir
 
@@ -28,12 +28,12 @@  mkdir -p toaster_logs
 
 python3 -m venv venv --without-pip --system-site-packages
 source venv/bin/activate
-python3 -m pip install -r $pokydir/bitbake/toaster-requirements.txt -r $pokydir/bitbake/lib/toaster/tests/toaster-tests-requirements.txt
+python3 -m pip install -r $bitbakedir/toaster-requirements.txt -r $bitbakedir/lib/toaster/tests/toaster-tests-requirements.txt
 
-python3 -m pytest -c $pokydir/bitbake/lib/toaster/pytest.ini $pokydir/bitbake/lib/toaster/tests/
+python3 -m pytest -c $bitbakedir/lib/toaster/pytest.ini $bitbakedir/lib/toaster/tests/
 
-if [ -e $pokydir/bitbake/lib/toaster/orm/fixtures/check_fixtures.py ]; then
+if [ -e $bitbakedir/lib/toaster/orm/fixtures/check_fixtures.py ]; then
     echo "Checking toaster fixtures"
-    cd $pokydir/bitbake/lib/toaster/orm/fixtures/
-    $pokydir/bitbake/lib/toaster/orm/fixtures/check_fixtures.py
+    cd $bitbakedir/lib/toaster/orm/fixtures/
+    $bitbakedir/lib/toaster/orm/fixtures/check_fixtures.py
 fi