Instead of invoking python from the configure venv manually, instruct developers to use the "run" script instead. Change the test invocation to be a good example going forward.
Signed-off-by: John Snow <[email protected]> --- .gitlab-ci.d/buildtest.yml | 6 +++--- scripts/device-crash-test | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.d/buildtest.yml b/.gitlab-ci.d/buildtest.yml index 4c280dd29bc..b2db70ff904 100644 --- a/.gitlab-ci.d/buildtest.yml +++ b/.gitlab-ci.d/buildtest.yml @@ -102,7 +102,7 @@ crash-test-debian: script: - cd build - make NINJA=":" check-venv - - pyvenv/bin/python3 scripts/device-crash-test -q --tcg-only ./qemu-system-i386 + - ./run scripts/device-crash-test -q --tcg-only ./qemu-system-i386 build-system-fedora: extends: @@ -159,8 +159,8 @@ crash-test-fedora: script: - cd build - make NINJA=":" check-venv - - pyvenv/bin/python3 scripts/device-crash-test -q ./qemu-system-ppc - - pyvenv/bin/python3 scripts/device-crash-test -q ./qemu-system-riscv32 + - ./run scripts/device-crash-test -q ./qemu-system-ppc + - ./run scripts/device-crash-test -q ./qemu-system-riscv32 build-system-centos: extends: diff --git a/scripts/device-crash-test b/scripts/device-crash-test index f97d9909c05..8a91dcaee31 100755 --- a/scripts/device-crash-test +++ b/scripts/device-crash-test @@ -42,7 +42,7 @@ except ModuleNotFoundError as exc: print(f"Module '{exc.name}' not found.") print(" Try 'make check-venv' from your build directory,") print(" and then one way to run this script is like so:") - print(f' > $builddir/pyvenv/bin/python3 "{path}"') + print(f' > $builddir/run "{path}"') sys.exit(1) logger = logging.getLogger('device-crash-test') -- 2.52.0
