From 3a08e558af0c521778c08e6ceabb0a72f8b5954d Mon Sep 17 00:00:00 2001 From: felixmaechtle <32329137+felixmaechtle@users.noreply.github.com> Date: Tue, 7 Nov 2023 14:22:00 +0100 Subject: [PATCH 1/5] Update swat module-info --- benchexec/tools/swat.py | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/benchexec/tools/swat.py b/benchexec/tools/swat.py index 313befe6d..31aacd413 100644 --- a/benchexec/tools/swat.py +++ b/benchexec/tools/swat.py @@ -15,6 +15,15 @@ class Tool(BaseTool2): SWAT is currently being developed by the Institute for IT Security at the University of Luebeck. """ + REQUIRED_PATHS = [ + "knife-fuzzer/symbolic-executor/lib/symbolic-executor.jar", + "knife-fuzzer/symbolic-explorer", + "local_z3_installation", + "WitnessCreator", + "run-swat.sh", + "run_swat.py" + ] + def executable(self, tool_locator): return tool_locator.find_executable("run-swat.sh") @@ -24,6 +33,14 @@ def name(self): def project_url(self): return "https://www.its.uni-luebeck.de/en/institute.html" + def version(self, executable): + return self._version_from_tool(executable, arg="-v") + + def program_files(self, executable): + return self._program_files_from_executable( + executable, self.REQUIRED_PATHS, parent_dir=False + ) + def cmdline(self, executable, options, task, rlimits): cmd = [executable] + options if task.property_file: From d89ad5916efff38db680ba602d42e29e7e84153b Mon Sep 17 00:00:00 2001 From: felixmaechtle <32329137+felixmaechtle@users.noreply.github.com> Date: Tue, 7 Nov 2023 14:31:25 +0100 Subject: [PATCH 2/5] Update swat.py --- benchexec/tools/swat.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/benchexec/tools/swat.py b/benchexec/tools/swat.py index 31aacd413..b4c0b90b1 100644 --- a/benchexec/tools/swat.py +++ b/benchexec/tools/swat.py @@ -16,8 +16,7 @@ class Tool(BaseTool2): """ REQUIRED_PATHS = [ - "knife-fuzzer/symbolic-executor/lib/symbolic-executor.jar", - "knife-fuzzer/symbolic-explorer", + "knife-fuzzer", "local_z3_installation", "WitnessCreator", "run-swat.sh", From cdc608bb76ef865a6c3949bc8e360d7b82a3f5ea Mon Sep 17 00:00:00 2001 From: felixmaechtle <32329137+felixmaechtle@users.noreply.github.com> Date: Tue, 7 Nov 2023 14:33:14 +0100 Subject: [PATCH 3/5] Code formatting swat.py --- benchexec/tools/swat.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/benchexec/tools/swat.py b/benchexec/tools/swat.py index b4c0b90b1..9b61b0c72 100644 --- a/benchexec/tools/swat.py +++ b/benchexec/tools/swat.py @@ -20,7 +20,7 @@ class Tool(BaseTool2): "local_z3_installation", "WitnessCreator", "run-swat.sh", - "run_swat.py" + "run_swat.py", ] def executable(self, tool_locator): From d745bd9413a24d3672486e3ff448ec8e159b0921 Mon Sep 17 00:00:00 2001 From: felixmaechtle <32329137+felixmaechtle@users.noreply.github.com> Date: Tue, 7 Nov 2023 17:55:55 +0100 Subject: [PATCH 4/5] Update swat.py --- benchexec/tools/swat.py | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/benchexec/tools/swat.py b/benchexec/tools/swat.py index 9b61b0c72..18f4225b2 100644 --- a/benchexec/tools/swat.py +++ b/benchexec/tools/swat.py @@ -20,7 +20,7 @@ class Tool(BaseTool2): "local_z3_installation", "WitnessCreator", "run-swat.sh", - "run_swat.py", + "run_swat.py" ] def executable(self, tool_locator): @@ -30,16 +30,11 @@ def name(self): return "SWAT" def project_url(self): - return "https://www.its.uni-luebeck.de/en/institute.html" + return "https://www.its.uni-luebeck.de/en/research/tools/swat/" def version(self, executable): return self._version_from_tool(executable, arg="-v") - def program_files(self, executable): - return self._program_files_from_executable( - executable, self.REQUIRED_PATHS, parent_dir=False - ) - def cmdline(self, executable, options, task, rlimits): cmd = [executable] + options if task.property_file: From 8f8abda48a02a569f565f5d17e892ec4a9360609 Mon Sep 17 00:00:00 2001 From: felixmaechtle <32329137+felixmaechtle@users.noreply.github.com> Date: Tue, 7 Nov 2023 17:57:00 +0100 Subject: [PATCH 5/5] Update swat.py --- benchexec/tools/swat.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/benchexec/tools/swat.py b/benchexec/tools/swat.py index 18f4225b2..c62b4fb56 100644 --- a/benchexec/tools/swat.py +++ b/benchexec/tools/swat.py @@ -20,7 +20,7 @@ class Tool(BaseTool2): "local_z3_installation", "WitnessCreator", "run-swat.sh", - "run_swat.py" + "run_swat.py", ] def executable(self, tool_locator):