Skip to content

Commit

Permalink
remove erroneous relpath call
Browse files Browse the repository at this point in the history
  • Loading branch information
ricffb committed Dec 4, 2024
1 parent 58dc945 commit 80bb329
Showing 1 changed file with 6 additions and 2 deletions.
8 changes: 6 additions & 2 deletions contrib/vcloud/benchmarkclient_executor.py
Original file line number Diff line number Diff line change
Expand Up @@ -58,12 +58,14 @@ def find_executable(self, executable_name, subdir=""):

assert self.container_mount_point is not None, "Container mount point not set"

# At this point we know, that the tool is located at container_mount_point
# as the container as the tool_dir mounted to this location
dirs.append(os.path.join(self.container_mount_point, subdir))
logging.debug("Searching for executable %s in %s", executable_name, dirs)

executable = benchexec.util.find_executable2(executable_name, dirs)
if executable:
return os.path.relpath(executable, self.tool_directory)
return executable

other_file = benchexec.util.find_executable2(executable_name, dirs, os.F_OK)
if other_file:
Expand Down Expand Up @@ -96,8 +98,10 @@ def init(config, benchmark):
tool_locator = benchexec.tooladapter.create_tool_locator(config)

benchmark.executable = benchmark.tool.executable(tool_locator)

print(f"Executable: {benchmark.executable}")
benchmark.tool_version = benchmark.tool.version(benchmark.executable)
print(f"Tool version: {benchmark.tool_version}")
sys.exit(0)
environment = benchmark.environment()
if environment.get("keepEnv", None) or environment.get("additionalEnv", None):
sys.exit(
Expand Down

0 comments on commit 80bb329

Please sign in to comment.