Simplify tool-info module of MetaVal
In practice if we wrap a tool that still extends BaseTool,
we should adapt that tool to the new BaseTool2 instead of having
to handle this case inside the tool-info module of MetaVal.
@@ -117,7 +117,7 @@ class Tool(benchexec.tools.template.BaseTool2):
if verifierName in self.wrappedTools:
tool = self.wrappedTools[verifierName]
- if isinstance(tool, BaseTool2):
+ assert isinstance(tool, BaseTool2): "we expect that all wrapped tools extend BaseTool2"
wrapped_executable = self.wrappedTools[verifierName].executable(
BaseTool2.ToolLocator(
tool_directory=self.TOOL_TO_PATH_MAP[verifierName]
@@ -129,18 +129,6 @@ class Tool(benchexec.tools.template.BaseTool2):
[os.path.relpath(os.path.join(os.getcwd(), "output/ARG.c"))],
rlimits,
)
- elif isinstance(tool, BaseTool):
- with self._in_tool_directory(verifierName) as oldcwd:
- wrapped_executable = self.wrappedTools[verifierName].executable()
- wrappedOptions = self.wrappedTools[verifierName].cmdline(
- wrapped_executable,
- options,
- [os.path.relpath(os.path.join(oldcwd, "output/ARG.c"))],
- os.path.relpath(os.path.join(oldcwd, task.property_file)),
- rlimits,
- )
- else:
- sys.exit("ERROR: unknown BaseTool version.")
return (
[
