scripts/mtest2make: add support for SPEED=thorough
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
parent
bcda7b178f
commit
3e233e2917
|
@ -3,8 +3,9 @@ project('qemu', ['c'], meson_version: '>=0.58.2',
|
||||||
'b_staticpic=false', 'stdsplit=false'],
|
'b_staticpic=false', 'stdsplit=false'],
|
||||||
version: files('VERSION'))
|
version: files('VERSION'))
|
||||||
|
|
||||||
add_test_setup('quick', exclude_suites: 'slow', is_default: true)
|
add_test_setup('quick', exclude_suites: ['slow', 'thorough'], is_default: true)
|
||||||
add_test_setup('slow', env: ['G_TEST_SLOW=1', 'SPEED=slow'])
|
add_test_setup('slow', exclude_suites: ['thorough'], env: ['G_TEST_SLOW=1', 'SPEED=slow'])
|
||||||
|
add_test_setup('thorough', env: ['G_TEST_SLOW=1', 'SPEED=thorough'])
|
||||||
|
|
||||||
not_found = dependency('', required: false)
|
not_found = dependency('', required: false)
|
||||||
keyval = import('keyval')
|
keyval = import('keyval')
|
||||||
|
|
|
@ -23,8 +23,9 @@ class Suite(object):
|
||||||
print('''
|
print('''
|
||||||
SPEED = quick
|
SPEED = quick
|
||||||
|
|
||||||
.speed.quick = $(foreach s,$(sort $(filter-out %-slow, $1)), --suite $s)
|
.speed.quick = $(foreach s,$(sort $(filter-out %-slow %-thorough, $1)), --suite $s)
|
||||||
.speed.slow = $(foreach s,$(sort $1), --suite $s)
|
.speed.slow = $(foreach s,$(sort $(filter-out %-thorough, $1)), --suite $s)
|
||||||
|
.speed.thorough = $(foreach s,$(sort $1), --suite $s)
|
||||||
|
|
||||||
.mtestargs = --no-rebuild -t 0
|
.mtestargs = --no-rebuild -t 0
|
||||||
ifneq ($(SPEED), quick)
|
ifneq ($(SPEED), quick)
|
||||||
|
@ -52,11 +53,14 @@ def process_tests(test, targets, suites):
|
||||||
for s in test_suites:
|
for s in test_suites:
|
||||||
# The suite name in the introspection info is "PROJECT:SUITE"
|
# The suite name in the introspection info is "PROJECT:SUITE"
|
||||||
s = s.split(':')[1]
|
s = s.split(':')[1]
|
||||||
if s == 'slow':
|
if s == 'slow' or s == 'thorough':
|
||||||
continue
|
continue
|
||||||
if s.endswith('-slow'):
|
if s.endswith('-slow'):
|
||||||
s = s[:-5]
|
s = s[:-5]
|
||||||
suites[s].speeds.append('slow')
|
suites[s].speeds.append('slow')
|
||||||
|
if s.endswith('-thorough'):
|
||||||
|
s = s[:-9]
|
||||||
|
suites[s].speeds.append('thorough')
|
||||||
suites[s].deps.update(deps)
|
suites[s].deps.update(deps)
|
||||||
|
|
||||||
def emit_prolog(suites, prefix):
|
def emit_prolog(suites, prefix):
|
||||||
|
|
Loading…
Reference in New Issue