Github_Repos/cvw
1
0
Fork 1
mirror of https://github.com/openhwgroup/cvw synced 2025-02-11 06:05:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed error where an elif was written as if in test conditionals

Browse Source
This commit is contained in:
slmnemo 2024-10-23 08:47:56 -07:00
parent e4b4cff270
commit dfbe01084f
1 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
bin/nightly_build.py
View File

@ -410,7 +410,7 @@ class TestRunner:
# Remove ANSI escape codes # Remove ANSI escape codes
line = re.sub(r'\x1b\[[0-9;]*[mGK]', '', lines[index]) line = re.sub(r'\x1b\[[0-9;]*[mGK]', '', lines[index])
if "Success" in line: if "Success" in line: # test succeeds
passed_configs.append(line.split(':')[0].strip()) passed_configs.append(line.split(':')[0].strip())
elif "passed lint" in line: elif "passed lint" in line:
passed_configs.append(f"Lint: {line.split(' ')[0].strip()}") passed_configs.append(f"Lint: {line.split(' ')[0].strip()}")
@ -419,13 +419,21 @@ class TestRunner:
failed_configs.append([f"Lint: {line.split(' ')[0].strip()}", "No Log File"]) failed_configs.append([f"Lint: {line.split(' ')[0].strip()}", "No Log File"])
#failed_configs.append(line) #failed_configs.append(line)
elif "Failures detected in output" in line: elif "Failures detected in output" in line: # Text explicitly fails
try: try:
config_name = line.split(':')[0].strip() config_name = line.split(':')[0].strip()
log_file = os.path.abspath(os.path.join("logs", config_name, ".log")) log_file = os.path.abspath(os.path.join("logs", config_name, ".log"))
failed_configs.append((config_name, log_file)) failed_configs.append((config_name, log_file))
except: except:
failed_configs.append((config_name, "Log file not found")) failed_configs.append((config_name, "Log file not found"))
elif "Timeout" in line: # Test times out
try:
config_name = line.split(':')[0].strip()
log_file = os.path.abspath("logs/"+config_name+".log")
failed_configs.append((f"Timeout: {config_name}", log_file))
except:
failed_configs.append((f"Timeout: {config_name}", "No Log File"))
index += 1 index += 1
@ -664,7 +672,7 @@ def main():
parser.add_argument('--path',default = "nightly", help='specify the path for where the nightly repositories will be cloned ex: "nightly-runs') parser.add_argument('--path',default = "nightly", help='specify the path for where the nightly repositories will be cloned ex: "nightly-runs')
parser.add_argument('--repository',default = "https://github.com/openhwgroup/cvw", help='specify which github repository you want to clone') parser.add_argument('--repository',default = "https://github.com/openhwgroup/cvw", help='specify which github repository you want to clone')
parser.add_argument('--target', default = "all", help='types of tests you can make are: all, wally-riscv-arch-test, no') parser.add_argument('--target', default = "--jobs", help='types of tests you can make are: all, wally-riscv-arch-test, no')
parser.add_argument('--tests', default = "nightly", help='types of tests you can run are: nightly, test, test_lint') parser.add_argument('--tests', default = "nightly", help='types of tests you can run are: nightly, test, test_lint')
parser.add_argument('--send_email',default = "", nargs="+", help='What emails to send test results to. Example: "[email1],[email2],..."') parser.add_argument('--send_email',default = "", nargs="+", help='What emails to send test results to. Example: "[email1],[email2],..."')
@ -699,7 +707,7 @@ def main():
# flags are a list # flags are a list
if (args.tests == "all"): if (args.tests == "all"):
test_list = [["python", "./regression-wally", ["--nightly", "--buildroot"]]] test_list = [["python", "./regression-wally", ["--nightly", "--buildroot"]]]
if (args.tests == "nightly"): elif (args.tests == "nightly"):
test_list = [["python", "./regression-wally", ["--nightly"]]] test_list = [["python", "./regression-wally", ["--nightly"]]]
elif (args.tests == "regression"): elif (args.tests == "regression"):
test_list = [["python", "./regression-wally", []]] test_list = [["python", "./regression-wally", []]]
@ -755,11 +763,12 @@ def main():
if args.target != "no": if args.target != "no":
test_runner.execute_makefile(target = args.target, makefile_path=test_runner.cvw) test_runner.execute_makefile(target = args.target, makefile_path=test_runner.cvw)
if args.target == "all": # TODO: remove vestigial code if no longer wanted
# Compile Linux for local testing # if args.target == "all":
test_runner.set_env_var("RISCV",str(test_runner.cvw)) # # Compile Linux for local testing
linux_path = test_runner.cvw / "linux" # test_runner.set_env_var("RISCV",str(test_runner.cvw))
test_runner.execute_makefile(target = "all", makefile_path=linux_path) # linux_path = test_runner.cvw / "linux"
# test_runner.execute_makefile(target = "all", makefile_path=linux_path)
############################################# #############################################
# RUN TESTS # # RUN TESTS #