Skip to content
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

update spf to BaseTool2 #1138

Merged
merged 3 commits into from
Dec 18, 2024
Merged

update spf to BaseTool2 #1138

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3b552c5
update spf to BaseTool2
ricffb Dec 17, 2024
dd61ae1
remove support for identifier
ricffb Dec 18, 2024
dc0c97d
Rename parameter in benchexec/tools/spf.py
PhilippWendler Dec 18, 2024
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
18 changes: 9 additions & 9 deletions benchexec/tools/spf.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,11 @@
#
# SPDX-License-Identifier: Apache-2.0

import benchexec.util as util
import benchexec.tools.template
import benchexec.result as result
import benchexec.tools.template


class Tool(benchexec.tools.template.BaseTool):
class Tool(benchexec.tools.template.BaseTool2):
"""
Tool info for JPF with symbolic extension (SPF)
"""
Expand All @@ -25,8 +24,8 @@ class Tool(benchexec.tools.template.BaseTool):
"jpf-sv-comp",
]

def executable(self):
return util.find_executable("jpf-sv-comp")
def executable(self, tool_locator):
return tool_locator.find_executable("jpf-sv-comp")

def name(self):
return "SPF"
Expand All @@ -39,11 +38,12 @@ def version(self, executable):
first_line = output.splitlines()[0]
return first_line.strip()

def cmdline(self, executable, options, tasks, propertyfile, rlimits):
options = options + ["--propertyfile", propertyfile]
return [executable] + options + tasks
def cmdline(self, executable, options, task, rlimits):
options = options + ["--propertyfile", task.property_file]
return [executable] + options + list(task.input_files)

def determine_result(self, returncode, returnsignal, output, isTimeout):
def determine_result(self, run):
output = run.output
# parse output
status = result.RESULT_UNKNOWN

Expand Down
Loading