Skip to content

Fix how we check for incorrect statement/output validator directory #324

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
gkreitz merged 1 commit into from
May 23, 2025
Merged

Fix how we check for incorrect statement/output validator directory #324

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
17 changes: 13 additions & 4 deletions problemtools/verifyproblem.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,15 @@ def debug(self, msg: str, *args) -> None:
def msg(self, msg):
print(msg)

def warn_directory(self, name: str, prop: str) -> None:
"""Warns if a directory meant for a different problem format version exists"""
good_dir = getattr(self.problem.format, prop)
bad_dirs = {getattr(version, prop) for version in FormatVersion} - {good_dir}
problem_root = Path(self.problem.probdir)
for directory in bad_dirs:
if (problem_root / directory).exists():
self.warning(f'Found directory "{directory}". Version {self.problem.format} looks for {name} in "{good_dir}"')

def _add_error(self) -> None:
self.errors += 1
if self.problem is not self:
Expand Down Expand Up @@ -738,6 +747,8 @@ def check(self, context: Context) -> bool:
return self._check_res
self._check_res = True

self.warn_directory('problem statements', 'statement_directory')

if not self.statements:
if self.problem.format is FormatVersion.LEGACY:
allowed_statements = ', '.join(
Expand Down Expand Up @@ -1168,16 +1179,12 @@ class OutputValidators(ProblemPart):
PART_NAME = 'output_validator'

def setup(self):
if self.problem.format is FormatVersion.LEGACY and (Path(self.problem.probdir) / 'output_validators').exists():
self.error('output_validators is not supported after Legacy; please use output_validator instead')

self._validators = run.find_programs(
os.path.join(self.problem.probdir, self.problem.format.output_validator_directory),
language_config=self.problem.language_config,
work_dir=self.problem.tmpdir,
)
self._has_precompiled = False
return {}

def __str__(self) -> str:
return 'output validators'
Expand All @@ -1193,6 +1200,8 @@ def check(self, context: Context) -> bool:
return self._check_res
self._check_res = True

self.warn_directory('output validators', 'output_validator_directory')

recommended_output_validator_languages = {'c', 'cpp', 'python3'}

for v in self._validators:
Expand Down