Skip to content

follow up to #30 #31

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

Open
Dylan-Brotherston wants to merge 3 commits into
base: main
Choose a base branch
from
Open

follow up to #30 #31

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
77dae89
use hardlinks in link_program()
Dylan-Brotherston Apr 27, 2022
e71dafb
:art: Format Python code with psf/black
Dylan-Brotherston Apr 27, 2022
f375e32
make mypy happy
Dylan-Brotherston Apr 27, 2022
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
77 changes: 64 additions & 13 deletions run_tests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,11 +139,16 @@ def run_one_test(
print(description, end="", file=file)

individual_tests = []
linked_program: Dict[str, str] = {}
for compile_command in parameters["compile_commands"] or [""]:

if compile_command:
link_program(
parameters["program"], compile_command, test_files, debug=debug
parameters["program"],
compile_command,
test_files,
linked_program=linked_program,
debug=debug,
)

if parameters["setup_command"]:
Expand All @@ -164,6 +169,10 @@ def run_one_test(
compile_command_str += " " + " ".join(test_files)

individual_test.run_test(compile_command=compile_command_str)

if linked_program:
unlink_program(linked_program=linked_program, debug=debug)

individual_tests.append(individual_test)
if not individual_test.stderr_ok and not parameters["allow_unexpected_stderr"]:
break
Expand Down Expand Up @@ -284,10 +293,7 @@ def run_compilers(
try:
if debug > 1:
print(f"os.rename({program}, {unique_program_name})", file=sys.stderr)
if not os.path.islink(program):
# this rename, in conjunction with link_program, will *always* cause a symlink loop
# there probably are reasons to rename a symlink but unless link_program is changed we cannot do so
os.rename(program, unique_program_name)
os.rename(program, unique_program_name)
except OSError as e:
if debug:
print(e, file=file)
Expand Down Expand Up @@ -322,15 +328,18 @@ def link_program(
unique_program_name = get_unique_program_name(program, compile_command, test_files)

# should already be linked
if linked_program.get(program, None) == unique_program_name and os.path.exists(
program
if (
linked_program.get(program, None) == unique_program_name
and os.path.exists(program)
and os.path.exists(unique_program_name)
and os.stat(program).st_ino == os.stat(unique_program_name).st_ino
):
if debug > 2:
print("link_program - using existing link")
return

# for safety don't remove anything but a link
if os.path.islink(program):
if program in linked_program:
if debug > 2:
print("link_program - removing existing link")
os.unlink(program)
Expand All @@ -340,20 +349,62 @@ def link_program(
if debug > 3:
print("link_program - before link command")
subprocess.call("pwd", shell=True)
subprocess.call("ls -l", shell=True)
print(f"os.symlink({unique_program_name}, {program})", file=sys.stderr)
subprocess.call("ls -il", shell=True)

# os.path.islink() only checks for symlinks, not hard links
os.symlink(unique_program_name, program)
if debug > 2:
print(f"os.link({unique_program_name}, {program})", file=sys.stderr)

os.link(unique_program_name, program)

if debug > 3:
print("link_program - after link command")
subprocess.call("pwd", shell=True)
subprocess.call("ls -l", shell=True)
subprocess.call("ls -il", shell=True)

linked_program[program] = unique_program_name


def unlink_program(
linked_program: Dict[str, str] = {},
debug: int = 0,
) -> None:
"""
linked_program should be a dict shuch that each key is a hard link to its value

This function will remove all keys from the file system,
even if they are not hard links (but is nice enough tell you when it does so)

This function is intended to be the inverse of link_program
"""
if debug > 3:
print("unlink_program - before unlink commands")
subprocess.call("pwd", shell=True)
subprocess.call("ls -il", shell=True)

for link, target in linked_program.items():
try:
if not os.stat(link).st_ino == os.stat(target).st_ino:
if debug > 1:
print(f"unlink_program {link} and {target} are not linked")
except OSError:
pass

if debug > 2:
print(f"unlink_program unlinking {link} from {target}")

try:
os.unlink(link)
except OSError:
pass

if debug > 3:
print("unlink_program - after unlink commands")
subprocess.call("pwd", shell=True)
subprocess.call("ls -il", shell=True)

linked_program.clear()


def get_unique_program_name(
program: str, compile_command: Union[List[str], str], test_files: List[str]
) -> str:
Expand Down