From 460fabb834758c8a3c47825d44a2363c585786b2 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Sat, 17 Jun 2023 11:30:16 +0100 Subject: [PATCH] oeqa/selftest/oescripts: Fix qemu-helper selftest The updated selftest was assuming qemu-bridge-helper was available on the host system which isn't always the case. Tweak the test case to avoid this issue by adding dedicated help output and checking for this specifically. (From OE-Core rev: 4a80e95d1f59e0ddcedde3f64d0a0d1dc48a6e4d) Signed-off-by: Richard Purdie --- meta/lib/oeqa/selftest/cases/oescripts.py | 4 ++-- .../qemu/qemu-helper/qemu-oe-bridge-helper.c | 6 ++++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/meta/lib/oeqa/selftest/cases/oescripts.py b/meta/lib/oeqa/selftest/cases/oescripts.py index 36acc006ca..7d3a00e2ab 100644 --- a/meta/lib/oeqa/selftest/cases/oescripts.py +++ b/meta/lib/oeqa/selftest/cases/oescripts.py @@ -123,8 +123,8 @@ class OEGitproxyTests(OEScriptTests): class OeRunNativeTest(OESelftestTestCase): def test_oe_run_native(self): bitbake("qemu-helper-native -c addto_recipe_sysroot") - result = runCmd("oe-run-native qemu-helper-native qemu-oe-bridge-helper", ignore_status=True) - self.assertIn("No bridge helper found", result.output) + result = runCmd("oe-run-native qemu-helper-native qemu-oe-bridge-helper --help") + self.assertIn("Helper function to find and exec qemu-bridge-helper", result.output) class OEListPackageconfigTests(OEScriptTests): #oe-core.scripts.List_all_the_PACKAGECONFIG's_flags diff --git a/meta/recipes-devtools/qemu/qemu-helper/qemu-oe-bridge-helper.c b/meta/recipes-devtools/qemu/qemu-helper/qemu-oe-bridge-helper.c index 9434e1d269..c34aa00567 100644 --- a/meta/recipes-devtools/qemu/qemu-helper/qemu-oe-bridge-helper.c +++ b/meta/recipes-devtools/qemu/qemu-helper/qemu-oe-bridge-helper.c @@ -7,6 +7,7 @@ */ #include +#include #include #include @@ -25,6 +26,11 @@ int main(int argc, char** argv) { return 1; } + if (argc == 2 && strcmp(argv[1], "--help") == 0) { + fprintf(stderr, "Helper function to find and exec qemu-bridge-helper. Set QEMU_BRIDGE_HELPER to override default search path\n"); + return 0; + } + try_program("/usr/libexec/qemu-bridge-helper", argv); try_program("/usr/lib/qemu/qemu-bridge-helper", argv);