diff options
| author | Philippe Mathieu-Daudé <philmd@linaro.org> | 2022-12-09 17:47:43 +0100 |
|---|---|---|
| committer | Thomas Huth <thuth@redhat.com> | 2023-01-09 13:50:13 +0100 |
| commit | 44c8a6ab45f48ea8efb0a9930127819afd7ee280 (patch) | |
| tree | 5bd1e1397432b6872f19d2a28b5ef34521ab74e8 /tests/vm | |
| parent | ad302b21aab6ce873c46c0e9d1ec17842b83132e (diff) | |
tests/vm: Update get_default_jobs() to work on non-x86_64 non-KVM hosts
On non-x86_64 host, if KVM is not available we get:
Traceback (most recent call last):
File "tests/vm/basevm.py", line 634, in main
vm = vmcls(args, config=config)
File "tests/vm/basevm.py", line 104, in __init__
mem = max(4, args.jobs)
TypeError: '>' not supported between instances of 'NoneType' and 'int'
Fix by always returning a -- not ideal but safe -- '1' value.
Fixes: b09539444a ("tests/vm: allow us to take advantage of MTTCG")
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-Id: <20221209164743.70836-1-philmd@linaro.org>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
Diffstat (limited to 'tests/vm')
| -rw-r--r-- | tests/vm/basevm.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/tests/vm/basevm.py b/tests/vm/basevm.py index 2276364c42..23229e23d1 100644 --- a/tests/vm/basevm.py +++ b/tests/vm/basevm.py @@ -569,8 +569,7 @@ def parse_args(vmcls): # more cores. but only up to a reasonable limit. User # can always override these limits with --jobs. return min(multiprocessing.cpu_count() // 2, 8) - else: - return 1 + return 1 parser = argparse.ArgumentParser( formatter_class=argparse.ArgumentDefaultsHelpFormatter, |