Skip to content

More fixes to mctest logic #2512

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

Merged
willend merged 1 commit into from
Jun 23, 2026
+4 −4
Merged

More fixes to mctest logic #2512

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions tools/Python/mctest/mctest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -320,7 +320,6 @@ def mccode_test(branchdir, testdir, limitinstrs=None, instrfilter=None, compfilt
test.compiled = False
test.compiletime = -1
anyfailed=True
num_compilefail = num_compilefail + 1
elif os.path.exists(binfile):
test.compiled = True
test.compiletime = 0
Expand Down Expand Up @@ -376,6 +375,7 @@ def mccode_test(branchdir, testdir, limitinstrs=None, instrfilter=None, compfilt
f.close()
test.linted = True
else:
num_compilefail = num_compilefail + 1
formatstr = "%-" + "%ds: COMPILE ERROR using:\n" % maxnamelen
logging.info(formatstr % test.instrname + cmd)
f = open(compilefailed, "a")
Expand Down Expand Up @@ -541,7 +541,7 @@ def mccode_test(branchdir, testdir, limitinstrs=None, instrfilter=None, compfilt
for t in tests:
obj[t.get_display_name()] = t.get_json_repr()
obj["_meta"] = metainfo
return obj, anyfailed, num_compilefail, num_runfail, num_valfail
return (obj, anyfailed, num_compilefail, num_runfail, num_valfail)

#
# Utility
Expand Down Expand Up @@ -609,8 +609,8 @@ def run_default_test(testdir, mccoderoot, limit, instrfilter, compfilter, suffix
logging.info("Testing: %s" % version)
logging.info("")

results, failed, num_compilefail, num_runfail, num_valfail = mccode_test(mccoderoot, labeldir, limit, instrfilter, compfilter)
(results, failed, num_compilefail, num_runfail, num_valfail) = mccode_test(mccoderoot, labeldir, limit, instrfilter, compfilter)

reportfile = os.path.join(labeldir, "testresults_%s.json" % (mccode_config.configuration["MCCODE"]+"-"+version+suffix))
open(os.path.join(reportfile), "w").write(json.dumps(results, indent=2))

Expand Down
Loading