Skip to content

Fix runner execution and restore gcov support #395

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
PraveenPenguin wants to merge 2 commits into from
Closed

Fix runner execution and restore gcov support #395

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
05c267d
Fix runner execution and restore gcov support
PraveenPenguin Jul 1, 2026
8ff3168
Merge branch 'master' into new_fix
PraveenPenguin Jul 1, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
71 changes: 53 additions & 18 deletions avocado-setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -379,17 +379,20 @@ def bootstrap(enable_kvm=False, guest_os=None):
helper.copy_dir_file(postscript, postscript_dir)


def run_test(testsuite, avocado_bin, nrunner):
def run_test(testsuite, avocado_bin, runner, linux_src_path):
"""
To run given testsuite
:param testsuite: Testsuite object which has details about the tests
:param avocado_bin: Executable path of avocado
:param runner: Whether to use --test-runner runner (True) or --max-parallel-tasks=1 (False)
:param linux_src_path: Path to kernel source for gcov coverage (or None)
"""

if not nrunner:
nrunner = '--test-runner runner'
nrun = True
if runner:
runner = '--test-runner runner'
nrun = False
else:
nrunner = ''
runner = '--max-parallel-tasks=1'

logger.info('')
if 'guest' in testsuite.type:
Expand All @@ -405,7 +408,10 @@ def run_test(testsuite, avocado_bin, nrunner):
testsuite.resultdir, guest_args)
if 'host' in testsuite.type:
logger.info("Running Host Tests Suite %s", testsuite.shortname)
cmd = "%s run %s %s" % (avocado_bin, nrunner, testsuite.test)
if nrun:
cmd = "%s run %s %s" % (avocado_bin, runner, os.path.join(TEST_DIR, testsuite.test))
else:
cmd = "%s run %s %s" % (avocado_bin, runner, testsuite.test)
if testsuite.mux:
cmd += " -m %s" % os.path.join(TEST_DIR, testsuite.mux)
cmd += " --force-job-id %s \
Expand All @@ -415,10 +421,33 @@ def run_test(testsuite, avocado_bin, nrunner):
if testsuite.args:
cmd += testsuite.args

input_file = args.inputfile
try:
# Resetting the gcov flag to zero if code coverage is needed
if linux_src_path:
logger.info("kernel_src path=%s" % linux_src_path)
if not os.path.exists(linux_src_path):
exit("kernel-src path is not available, please check")
helper.gcov_reset()
logger.info("Running: %s", cmd)
status = os.system(cmd)
status = int(bin(int(status))[2:].zfill(16)[:-8], 2)
# Capturing the test and yaml names for gcov here
if linux_src_path:
test_name = testsuite.test + " " + testsuite.tempmux
out = (testsuite.name).split("_")
test_bucket = "_".join([out[1], out[2]])
logger.info("Capturing the Gcov data.....")
if test_bucket.startswith("io_"):
with open(input_file, 'r') as file:
for line in file:
if line.startswith("module"):
driver_name = (line.split("=")[-1]).strip()
helper.gcov_code_coverage(linux_src_path, test_name, driver_name)
else:
helper.gcov_code_coverage(linux_src_path, test_name)
helper.runcmd("cp %s/final_files.txt %s/" % (linux_src_path, outputdir),
ignore_status=True)
if status >= 2:
testsuite.runstatus(Testsuite_status.Not_Run.value, "Command execution failed")
count_testsuites_status[Testsuite_status.Not_Run.value] += 1
Expand Down Expand Up @@ -507,7 +536,7 @@ def edit_mux_file(test_config_name, mux_file_path, tmp_mux_path):
mux_fp.write(str("\n".join(mux_str_edited)))


def parse_test_config(test_config_file, avocado_bin, enable_kvm):
def parse_test_config(test_config_file, avocado_bin, enable_kvm, runner):
"""
Parses Test Config file and returns list of indivual tests dictionaries,
with test path and yaml file path.
Expand Down Expand Up @@ -572,6 +601,7 @@ def parse_test_config(test_config_file, avocado_bin, enable_kvm):
# Handling yaml file from second param
if '.yaml' in line[1]:
test_dic['mux'] = line[1]
test_dic['tempmux'] = line[1]
mux_flag = 1
test_dic['name'] = "%s_%s" % (test_dic['name'],
test_dic['mux'].split("/")[-1].split(".")[0])
Expand All @@ -588,6 +618,7 @@ def parse_test_config(test_config_file, avocado_bin, enable_kvm):
else:
arg_flag = 1
test_dic['args'] = " %s" % line[1]
test_dic['tempmux'] = None
count = 0
for list_dic in test_list:
if test_dic['name'] == list_dic['name'].split('.')[0]:
Expand All @@ -599,13 +630,14 @@ def parse_test_config(test_config_file, avocado_bin, enable_kvm):
arg_flag = 1
test_dic['args'] = " %s" % line[2]
test_list.append(test_dic)
if mux_flag == 0 and arg_flag == 0:
single_test_dic = {}
single_test_dic['name'] = test_config_name
single_test_dic['test'] = ''
for test in test_list:
single_test_dic['test'] += " %s" % test['test']
return [single_test_dic]
if runner:
if mux_flag == 0 and arg_flag == 0:
single_test_dic = {}
single_test_dic['name'] = test_config_name
single_test_dic['test'] = ''
for test in test_list:
single_test_dic['test'] += " %s" % test['test']
return [single_test_dic]
return test_list
logger.error("Test Config %s not present", test_config_file)
return []
Expand Down Expand Up @@ -670,8 +702,11 @@ def parse_test_config(test_config_file, avocado_bin, enable_kvm):
help='To remove/uninstall autotest, avocado from system')
parser.add_argument('--enable-kvm', dest="enable_kvm", action='store_true',
default=False, help='enable bootstrap kvm tests')
parser.add_argument('--nrunner', dest="nrunner", action='store_true',
default=False, help='enable Parallel run')
parser.add_argument('--runner', dest="runner", action='store_true',
default=False, help='To use legacy runner with --test-runner runner flag')
parser.add_argument('--code-cov', dest='linux_src_path', action='store',
default=None,
help='To enable code coverage. Pass the linux source path')

parser.add_argument('--run-tests', dest="run_tests", action='store',
default=None,
Expand Down Expand Up @@ -808,7 +843,7 @@ def parse_test_config(test_config_file, avocado_bin, enable_kvm):
for test_suite in test_suites:
if 'host' in test_suite:
test_list = parse_test_config(
test_suite, avocado_bin, args.enable_kvm)
test_suite, avocado_bin, args.enable_kvm, args.runner)
if not test_list:
Testsuites[test_suite] = TestSuite(test_suite, outputdir,
args.vt_type,
Expand Down Expand Up @@ -845,7 +880,7 @@ def parse_test_config(test_config_file, avocado_bin, enable_kvm):
count_testsuites_status[Testsuite_status.Total.value] = len(Testsuites_list)
for test_suite in Testsuites_list:
if not Testsuites[test_suite].run == Testsuite_status.Cant_Run.value:
run_test(Testsuites[test_suite], avocado_bin, args.nrunner)
run_test(Testsuites[test_suite], avocado_bin, args.runner, args.linux_src_path)
if args.interval:
time.sleep(int(args.interval))

Expand Down
Loading