Skip to content

Commit 5769afd

Browse files
committed
tests,misc: Fix broken 'requires' test & allocate to GH WFs
1 parent d153e93 commit 5769afd

File tree

1 file changed

+37
-41
lines changed

1 file changed

+37
-41
lines changed

tests/gem5/stdlib/test_requires.py

Lines changed: 37 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -29,58 +29,54 @@
2929
isa_map = {
3030
"sparc": constants.sparc_tag,
3131
"mips": constants.mips_tag,
32-
"null": constants.null_tag,
3332
"arm": constants.arm_tag,
3433
"x86": constants.vega_x86_tag,
3534
"power": constants.power_tag,
3635
"riscv": constants.riscv_tag,
3736
}
3837

3938
length_map = {
40-
"sparc": constants.long_tag,
41-
"mips": constants.long_tag,
42-
"null": constants.long_tag,
39+
"sparc": constants.very_long_tag,
40+
"mips": constants.very_long_tag,
4341
"arm": constants.long_tag,
4442
"x86": constants.long_tag,
45-
"power": constants.long_tag,
43+
"power": constants.very_long_tag,
4644
"riscv": constants.long_tag,
4745
}
4846

4947
for isa in isa_map.keys():
50-
if isa in ("x86", "arm"):
51-
# We only do these checks for X86 and ARM to save compiling
52-
# other ISAs.
53-
gem5_verify_config(
54-
name=f"requires-isa-{isa}",
55-
verifiers=(),
56-
fixtures=(),
57-
config=joinpath(
58-
config.base_dir,
59-
"tests",
60-
"gem5",
61-
"stdlib",
62-
"configs",
63-
"requires_check.py",
64-
),
65-
config_args=["-i", isa],
66-
valid_isas=(constants.all_compiled_tag,),
67-
length=length_map[isa],
68-
)
48+
gem5_verify_config(
49+
name=f"requires-isa-{isa}",
50+
verifiers=(),
51+
fixtures=(),
52+
config=joinpath(
53+
config.base_dir,
54+
"tests",
55+
"gem5",
56+
"stdlib",
57+
"configs",
58+
"requires_check.py",
59+
),
60+
config_args=["-i", isa],
61+
valid_isas=(isa_map[isa],),
62+
valid_hosts=constants.supported_hosts,
63+
length=length_map[isa],
64+
)
6965

70-
if isa != "null":
71-
gem5_verify_config(
72-
name=f"requires-isa-{isa}-with-all-compiled",
73-
verifiers=(),
74-
fixtures=(),
75-
config=joinpath(
76-
config.base_dir,
77-
"tests",
78-
"gem5",
79-
"stdlib",
80-
"configs",
81-
"requires_check.py",
82-
),
83-
config_args=["-i", isa],
84-
valid_isas=(constants.all_compiled_tag,),
85-
length=constants.quick_tag,
86-
)
66+
gem5_verify_config(
67+
name=f"requires-isa-{isa}-with-all-compiled",
68+
verifiers=(),
69+
fixtures=(),
70+
config=joinpath(
71+
config.base_dir,
72+
"tests",
73+
"gem5",
74+
"stdlib",
75+
"configs",
76+
"requires_check.py",
77+
),
78+
config_args=["-i", isa],
79+
valid_isas=(constants.all_compiled_tag,),
80+
valid_hosts=constants.supported_hosts,
81+
length=constants.quick_tag,
82+
)

0 commit comments

Comments
 (0)