Kernel
/
iwd
mirror of https://git.kernel.org/pub/scm/network/wireless/iwd.git
3
0
Fork 0
Code Releases Activity

auto-t: make test timeout configurable 

With the addition of DPP PKEX autotests some of the timeouts are
quite long and hit test-runners maximum timeouts. For UML we should
allow this since time-travel lets us skip idle waits. Move the test
timeout out of a global define and into the argument list so QEMU
and UML can define it differently.
This commit is contained in:
James Prestwood 2023-11-13 06:32:53 -08:00 committed by Denis Kenzior
parent 3b6d279184
commit 2be49a93ba
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tools/run-tests
View File

@ -27,8 +27,6 @@ from utils import Process, Namespace, BarChart
config = None config = None
intf_id = 0 intf_id = 0
TEST_MAX_TIMEOUT = 240
dbus.mainloop.glib.DBusGMainLoop(set_as_default=True) dbus.mainloop.glib.DBusGMainLoop(set_as_default=True)
def dbg(*s, **kwargs): def dbg(*s, **kwargs):
@ -52,7 +50,7 @@ def exit_vm():
p.kill() p.kill()
if config.ctx and config.ctx.results: if config.ctx and config.ctx.results:
success = print_results(config.ctx.results) success = print_results(config.ctx.results, int(config.ctx.args.timeout))
if config.ctx.args.result: if config.ctx.args.result:
write_results(config.ctx.args.result, config.ctx.results) write_results(config.ctx.args.result, config.ctx.results)
@ -917,7 +915,7 @@ def post_test(ctx, to_copy):
except: except:
pass pass
def print_results(results): def print_results(results, max_timeout):
table = PrettyTable(['Test', colored('Passed', 'green'), colored('Failed', 'red'), \ table = PrettyTable(['Test', colored('Passed', 'green'), colored('Failed', 'red'), \
colored('Skipped', 'cyan'), colored('Time', 'yellow')]) colored('Skipped', 'cyan'), colored('Time', 'yellow')])
@ -928,7 +926,7 @@ def print_results(results):
for test, result in results.items(): for test, result in results.items():
if result.time == TEST_MAX_TIMEOUT: if result.time == max_timeout:
failed = "Timed out" failed = "Timed out"
passed = "Timed out" passed = "Timed out"
elif result.time == 0: elif result.time == 0:
@ -975,7 +973,7 @@ def run_auto_tests(ctx, args):
p.start() p.start()
# Rather than time each subtest we just time the total but # Rather than time each subtest we just time the total but
# mutiply the default time by the number of tests being run. # mutiply the default time by the number of tests being run.
p.join(TEST_MAX_TIMEOUT * len(subtests)) p.join(int(args.timeout) * len(subtests))
if p.is_alive(): if p.is_alive():
# Timeout # Timeout
@ -983,7 +981,7 @@ def run_auto_tests(ctx, args):
ctx.results[os.path.basename(test)] = SimpleResult(run=0, ctx.results[os.path.basename(test)] = SimpleResult(run=0,
failures=0, errors=0, failures=0, errors=0,
skipped=0, time=TEST_MAX_TIMEOUT) skipped=0, time=int(args.timeout))
else: else:
ctx.results[os.path.basename(test)] = rqueue.get() ctx.results[os.path.basename(test)] = rqueue.get()

7
tools/runner.py
View File

@ -120,9 +120,12 @@ class RunnerCoreArgParse(ArgumentParser):
const=True, const=True,
action='store', action='store',
help='Use physical adapters for tests (passthrough)') help='Use physical adapters for tests (passthrough)')
# Hidden options only meant to be passed to the kernel
self.add_argument('--testhome', help=SUPPRESS) self.add_argument('--testhome', help=SUPPRESS)
self.add_argument('--monitor-parent', help=SUPPRESS) self.add_argument('--monitor-parent', help=SUPPRESS)
self.add_argument('--result-parent', help=SUPPRESS) self.add_argument('--result-parent', help=SUPPRESS)
self.add_argument('--timeout', help=SUPPRESS)
# Prevent --autotest/--unittest from being used together # Prevent --autotest/--unittest from being used together
auto_unit_group = self.add_mutually_exclusive_group() auto_unit_group = self.add_mutually_exclusive_group()
@ -385,6 +388,8 @@ class QemuRunner(RunnerAbstract):
self._prepare_outfiles() self._prepare_outfiles()
self.args.timeout = 240
if args.hw: if args.hw:
if os.path.isfile(args.hw): if os.path.isfile(args.hw):
hw_conf = ConfigParser() hw_conf = ConfigParser()
@ -543,6 +548,8 @@ class UmlRunner(RunnerAbstract):
self._prepare_outfiles() self._prepare_outfiles()
self.args.timeout = 1000
kern_log = "ignore_loglevel" if "kernel" in args.verbose else "quiet" kern_log = "ignore_loglevel" if "kernel" in args.verbose else "quiet"
cmd = [args.kernel, 'rootfstype=hostfs', 'ro', 'mem=256M', 'mac80211_hwsim.radios=0', cmd = [args.kernel, 'rootfstype=hostfs', 'ro', 'mem=256M', 'mac80211_hwsim.radios=0',