songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update file closing method and include logs for ignored files

This commit is contained in:
Nicolas Saillant 2024-06-11 12:35:08 +02:00
parent 2119d17df8
commit 3aa8e3ad73
1 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
Testsuite/test/post_process_ctest_results.py
View File

@ -58,12 +58,11 @@ with open(input_report_file_name, "rt", encoding="utf-8") as input_report_file:
if is_writing: if is_writing:
if match: if match:
is_writing = False is_writing = False
input_report_file.close()
if is_ignored: if is_ignored:
print("{label} {result}".format(label=name, result='r'), file=global_report) print("{label} {result}".format(label=name, result='r'), file=global_report)
is_ignored = False is_ignored = False
if lines_to_write: if lines_to_write:
file_path = "{dir}/{file}".format(dir=name, file=report_file_name) file_path = f"{name}/{report_file_name}"
if os.path.exists(file_path): if os.path.exists(file_path):
with open(file_path, "r", encoding="utf-8") as file: with open(file_path, "r", encoding="utf-8") as file:
contents = file.readlines() contents = file.readlines()
@ -74,11 +73,6 @@ with open(input_report_file_name, "rt", encoding="utf-8") as input_report_file:
if not any(re.search("- CMake Results .*", content) for content in contents): if not any(re.search("- CMake Results .*", content) for content in contents):
lines_to_write.insert(0, f"{Separator}\n- CMake Results for {name}\n{Separator}\n\n") lines_to_write.insert(0, f"{Separator}\n- CMake Results for {name}\n{Separator}\n\n")
if not any(re.search("- CMake Logs .*", content) for content in contents):
contents.insert(position - 1, Separator + "\n- CMake Logs from Installation \n" + Separator + "\n\n")
for log in installation_cmake_logs:
contents.insert(position, log)
position += 1
lines_to_write.insert(0, "\n") lines_to_write.insert(0, "\n")
contents[position:position] = lines_to_write contents[position:position] = lines_to_write
@ -86,7 +80,6 @@ with open(input_report_file_name, "rt", encoding="utf-8") as input_report_file:
file.write("".join(contents)) file.write("".join(contents))
lines_to_write = [] lines_to_write = []
if is_ignored: if is_ignored:
is_ignored = False is_ignored = False
else: else:
@ -115,15 +108,32 @@ with open(input_report_file_name, "rt", encoding="utf-8") as input_report_file:
if not os.path.isdir(name): if not os.path.isdir(name):
is_ignored = True is_ignored = True
os.mkdir(name) os.mkdir(name)
with open("{dir}/{file}".format(dir=name, file=report_file_name), "w", encoding="utf-8") as input_report_file: report_file_handle=open("{dir}/{file}".format(dir=name, file=report_file_name), "w+", encoding="utf-8")
input_report_file.write(open("{}/../../../../../.scm-branch".format(os.getcwd()), 'r', encoding="utf-8").read()) report_file_handle.write(open("{}/../../../../../.scm-branch".format(os.getcwd()), 'r', encoding="utf-8").read())
else: else:
is_ignored = False is_ignored = False
file_path = "{dir}/{file}".format(dir=name, file=report_file_name)
if os.path.exists(file_path):
with open(file_path, "r", encoding="utf-8") as file:
contents = file.readlines()
else:
contents = []
position = find_third_separator(contents)
if not any(re.search("- CMake Logs .*", content) for content in contents):
contents.insert(position - 1, Separator + "\n- CMake Logs from Installation \n" + Separator + "\n\n")
for log in installation_cmake_logs:
contents.insert(position, log)
position += 1
with open(file_path, "w", encoding="utf-8") as file:
file.write("".join(contents))
is_writing = True is_writing = True
if is_writing: if is_writing:
is_writing=False is_writing=False
input_report_file.close()
if is_ignored: if is_ignored:
print("{label} {result}".format(label=name, result='r'), file=global_report) print("{label} {result}".format(label=name, result='r'), file=global_report)
is_ignored=False is_ignored=False