Skip to content
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

run: fix disabling the c extension #988

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

run: fix disabling the c extension #988

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8e3bf64
run: fix disabling the `c` extension
fkokosinski Jul 11, 2024
58bc006
scripts/lib: increase the default timeout to 1 hour
fkokosinski Jul 12, 2024
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
7 changes: 6 additions & 1 deletion run.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -446,7 +446,12 @@ def gcc_compile(test_list, output_dir, isa, mabi, opts, debug_cmd):
if 'gen_opts' in test:
# Disable compressed instruction
if re.search('disable_compressed_instr', test['gen_opts']):
test_isa = re.sub("c", "", test_isa)
# Note that this substitution assumes the cannonical order
# of extensions, i.e. that extensions with preceding
# underscores will be provided after all letter extensions.
# This assumption should hold true, as this is a
# requirement enforced by e.g. gcc
test_isa = re.sub(r"(rv.+?)c", r"\1", test_isa)
# If march/mabi is not defined in the test gcc_opts, use the default
# setting from the command line.
if not re.search('march', cmd):
Expand Down
2 changes: 1 addition & 1 deletion scripts/lib.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ def get_env_var(var, debug_cmd=None):
return val


def run_cmd(cmd, timeout_s=999, exit_on_error=1, check_return_code=True,
def run_cmd(cmd, timeout_s=3600, exit_on_error=1, check_return_code=True,
debug_cmd=None):
"""Run a command and return output

Expand Down
Loading