mirror of
https://github.com/cirosantilli/linux-kernel-module-cheat.git
synced 2026-01-23 02:05:57 +01:00
fix test running after multi userland args change for gem5
This commit is contained in:
@@ -435,6 +435,7 @@ See: https://cirosantilli.com/linux-kernel-module-cheat#initrd
|
|||||||
self.add_argument(
|
self.add_argument(
|
||||||
'-b',
|
'-b',
|
||||||
'--baremetal',
|
'--baremetal',
|
||||||
|
action='append',
|
||||||
help='''\
|
help='''\
|
||||||
Use the given baremetal executable instead of the Linux kernel.
|
Use the given baremetal executable instead of the Linux kernel.
|
||||||
|
|
||||||
@@ -1161,8 +1162,8 @@ Incompatible archs are skipped.
|
|||||||
env['qcow2_file'] = env['buildroot_qcow2_file']
|
env['qcow2_file'] = env['buildroot_qcow2_file']
|
||||||
|
|
||||||
# Image
|
# Image
|
||||||
if env['baremetal'] is not None:
|
if env['baremetal']:
|
||||||
env['image'] = self.resolve_baremetal_executable(env['baremetal'])
|
env['image'] = self.resolve_baremetal_executable(env['baremetal'][0])
|
||||||
source_path_noext = os.path.splitext(join(
|
source_path_noext = os.path.splitext(join(
|
||||||
env['root_dir'],
|
env['root_dir'],
|
||||||
env['image'][len(env['baremetal_build_dir']) + 1:]
|
env['image'][len(env['baremetal_build_dir']) + 1:]
|
||||||
|
|||||||
@@ -63,10 +63,10 @@ If given, run only the given tests. Otherwise, run all tests.
|
|||||||
if my_path_properties.should_be_tested(self.env):
|
if my_path_properties.should_be_tested(self.env):
|
||||||
cur_run_args = run_args.copy()
|
cur_run_args = run_args.copy()
|
||||||
cur_run_args.update({
|
cur_run_args.update({
|
||||||
self.env['mode']: os.path.relpath(
|
self.env['mode']: [os.path.relpath(
|
||||||
os.path.join(path_abs, in_filename),
|
os.path.join(path_abs, in_filename),
|
||||||
os.getcwd()
|
os.getcwd()
|
||||||
),
|
)],
|
||||||
})
|
})
|
||||||
cur_run_args.update(my_path_properties['test_run_args'])
|
cur_run_args.update(my_path_properties['test_run_args'])
|
||||||
if my_path_properties['test_stdin_data'] is not None:
|
if my_path_properties['test_stdin_data'] is not None:
|
||||||
|
|||||||
Reference in New Issue
Block a user