| リビジョン | 3e233e29178dd9ebd3b3c3382a2e0ebea9e8127d (tree) |
|---|---|
| 日時 | 2022-01-28 19:13:33 |
| 作者 | Paolo Bonzini <pbonzini@redh...> |
| コミッター | Paolo Bonzini |
scripts/mtest2make: add support for SPEED=thorough
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
meson.build (diff)
scripts/mtest2make.py (diff)| @@ -3,8 +3,9 @@ project('qemu', ['c'], meson_version: '>=0.58.2', | ||
| 3 | 3 | 'b_staticpic=false', 'stdsplit=false'], |
| 4 | 4 | version: files('VERSION')) |
| 5 | 5 | |
| 6 | -add_test_setup('quick', exclude_suites: 'slow', is_default: true) | |
| 7 | -add_test_setup('slow', env: ['G_TEST_SLOW=1', 'SPEED=slow']) | |
| 6 | +add_test_setup('quick', exclude_suites: ['slow', 'thorough'], is_default: true) | |
| 7 | +add_test_setup('slow', exclude_suites: ['thorough'], env: ['G_TEST_SLOW=1', 'SPEED=slow']) | |
| 8 | +add_test_setup('thorough', env: ['G_TEST_SLOW=1', 'SPEED=thorough']) | |
| 8 | 9 | |
| 9 | 10 | not_found = dependency('', required: false) |
| 10 | 11 | keyval = import('keyval') |
| @@ -23,8 +23,9 @@ class Suite(object): | ||
| 23 | 23 | print(''' |
| 24 | 24 | SPEED = quick |
| 25 | 25 | |
| 26 | -.speed.quick = $(foreach s,$(sort $(filter-out %-slow, $1)), --suite $s) | |
| 27 | -.speed.slow = $(foreach s,$(sort $1), --suite $s) | |
| 26 | +.speed.quick = $(foreach s,$(sort $(filter-out %-slow %-thorough, $1)), --suite $s) | |
| 27 | +.speed.slow = $(foreach s,$(sort $(filter-out %-thorough, $1)), --suite $s) | |
| 28 | +.speed.thorough = $(foreach s,$(sort $1), --suite $s) | |
| 28 | 29 | |
| 29 | 30 | .mtestargs = --no-rebuild -t 0 |
| 30 | 31 | ifneq ($(SPEED), quick) |
| @@ -52,11 +53,14 @@ def process_tests(test, targets, suites): | ||
| 52 | 53 | for s in test_suites: |
| 53 | 54 | # The suite name in the introspection info is "PROJECT:SUITE" |
| 54 | 55 | s = s.split(':')[1] |
| 55 | - if s == 'slow': | |
| 56 | + if s == 'slow' or s == 'thorough': | |
| 56 | 57 | continue |
| 57 | 58 | if s.endswith('-slow'): |
| 58 | 59 | s = s[:-5] |
| 59 | 60 | suites[s].speeds.append('slow') |
| 61 | + if s.endswith('-thorough'): | |
| 62 | + s = s[:-9] | |
| 63 | + suites[s].speeds.append('thorough') | |
| 60 | 64 | suites[s].deps.update(deps) |
| 61 | 65 | |
| 62 | 66 | def emit_prolog(suites, prefix): |
Fork