diff options
| author | John Snow | 2022-05-26 02:09:21 +0200 |
|---|---|---|
| committer | Paolo Bonzini | 2022-06-06 09:26:54 +0200 |
| commit | 1d8cf47e5b8b4faa95954824cb6610d81c50d7d2 (patch) | |
| tree | bd84458af018dc481f700f52020a25d418deb62c /scripts/device-crash-test | |
| parent | tests: add python3-venv to debian10.docker (diff) | |
| download | qemu-1d8cf47e5b8b4faa95954824cb6610d81c50d7d2.tar.gz qemu-1d8cf47e5b8b4faa95954824cb6610d81c50d7d2.tar.xz qemu-1d8cf47e5b8b4faa95954824cb6610d81c50d7d2.zip | |
tests: run 'device-crash-test' from tests/venv
Remove the sys.path hacking from device-crash-test, and add in a little
user-friendly message for anyone who was used to running this script
directly from the source tree.
Modify the GitLab job recipes to create the tests/venv first, then run
device-crash-test from that venv.
Signed-off-by: John Snow <jsnow@redhat.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20220526000921.1581503-10-jsnow@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'scripts/device-crash-test')
| -rwxr-xr-x | scripts/device-crash-test | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/scripts/device-crash-test b/scripts/device-crash-test index a203b3fdea..73bcb98693 100755 --- a/scripts/device-crash-test +++ b/scripts/device-crash-test @@ -33,10 +33,18 @@ import re import random import argparse from itertools import chain - -sys.path.append(os.path.join(os.path.dirname(__file__), '..', 'python')) -from qemu.machine import QEMUMachine -from qemu.qmp import ConnectError +from pathlib import Path + +try: + from qemu.machine import QEMUMachine + from qemu.qmp import ConnectError +except ModuleNotFoundError as exc: + path = Path(__file__).resolve() + 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/tests/venv/bin/python3 "{path}"') + sys.exit(1) logger = logging.getLogger('device-crash-test') dbg = logger.debug |