diff options
| author | Alexander Kanavin <alex@linutronix.de> | 2024-05-21 14:50:41 +0200 |
|---|---|---|
| committer | Steve Sakoman <steve@sakoman.com> | 2025-02-12 06:25:37 -0800 |
| commit | fda81f7c201b11c321991361d4d3e5a68c73d9e7 (patch) | |
| tree | d5d62e771c4ec94709b6bd74a28b533987c57ac8 /meta/lib | |
| parent | 48ac27c8dca9ffe2c056bd8c73f6d00f2f75f748 (diff) | |
| download | poky-fda81f7c201b11c321991361d4d3e5a68c73d9e7.tar.gz | |
selftest/rust: correctly form the PATH environment variable
There were two issues here:
- the path to native python was not included, so the test
suite was running with host python, causing failures due to
host python being given native libraries:
https://autobuilder.yoctoproject.org/typhoon/#/builders/148/builds/1711/steps/12/logs/stdio
(rust recipe uses native python throughout)
- tmp/hosttools was listead ahead of native-sysroot/usr/bin
(From OE-Core rev: 72156282059aa5a013a386eb95f89dc38726326e)
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit aec96b5aec8d6b4a5ae8a719ca05bb727a6197cb)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Diffstat (limited to 'meta/lib')
| -rw-r--r-- | meta/lib/oeqa/selftest/cases/rust.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/meta/lib/oeqa/selftest/cases/rust.py b/meta/lib/oeqa/selftest/cases/rust.py index ca98f8c0fd..26f132edc4 100644 --- a/meta/lib/oeqa/selftest/cases/rust.py +++ b/meta/lib/oeqa/selftest/cases/rust.py | |||
| @@ -208,9 +208,8 @@ class RustSelfTestSystemEmulated(OESelftestTestCase, OEPTestResultTestCase): | |||
| 208 | tmpdir = get_bb_var("TMPDIR", "rust") | 208 | tmpdir = get_bb_var("TMPDIR", "rust") |
| 209 | 209 | ||
| 210 | # Set path for target-poky-linux-gcc, RUST_TARGET_PATH and hosttools. | 210 | # Set path for target-poky-linux-gcc, RUST_TARGET_PATH and hosttools. |
| 211 | cmd = " export PATH=%s/recipe-sysroot-native/usr/bin:$PATH;" % rustlibpath | 211 | cmd = "export TARGET_VENDOR=\"-poky\";" |
| 212 | cmd = cmd + " export TARGET_VENDOR=\"-poky\";" | 212 | cmd = cmd + " export PATH=%s/recipe-sysroot-native/usr/bin/python3-native:%s/recipe-sysroot-native/usr/bin:%s/recipe-sysroot-native/usr/bin/%s:%s/hosttools:$PATH;" % (rustlibpath, rustlibpath, rustlibpath, tcpath, tmpdir) |
| 213 | cmd = cmd + " export PATH=%s/recipe-sysroot-native/usr/bin/%s:%s/hosttools:$PATH;" % (rustlibpath, tcpath, tmpdir) | ||
| 214 | cmd = cmd + " export RUST_TARGET_PATH=%s/rust-targets;" % rustlibpath | 213 | cmd = cmd + " export RUST_TARGET_PATH=%s/rust-targets;" % rustlibpath |
| 215 | # Trigger testing. | 214 | # Trigger testing. |
| 216 | cmd = cmd + " export TEST_DEVICE_ADDR=\"%s:12345\";" % qemu.ip | 215 | cmd = cmd + " export TEST_DEVICE_ADDR=\"%s:12345\";" % qemu.ip |