test: replace workspace_dir arg with binary_dir in get_binary

Instead of get_binary assuming it always operates on a cargo build
directory, have it directly operate on a "binary directory" in the sense
of the --binary-dir parameter. Nothing was using the workspace_dir arg,
so no functional changes.

Signed-off-by: Patrick Roy <[email protected]>

Author: roypat

tests/host_tools/cargo_build.py

@@ -7,7 +7,7 @@
 from pathlib import Path
 
 from framework import defs, utils
-from framework.defs import FC_WORKSPACE_DIR
+from framework.defs import DEFAULT_BINARY_DIR
 from framework.with_filelock import with_filelock
 
 DEFAULT_TARGET = f"{platform.machine()}-unknown-linux-musl"
@@ -56,12 +56,11 @@ def cargo_test(path, extra_args=""):
     cargo("test", extra_args + " --all --no-fail-fast", env=env)
 
 
-def get_binary(name, *, workspace_dir=FC_WORKSPACE_DIR, example=None):
+def get_binary(name, *, binary_dir=DEFAULT_BINARY_DIR, example=None):
     """Get a binary. The binaries are built before starting a testrun."""
-    target_dir = workspace_dir / "build" / "cargo_target" / DEFAULT_TARGET_DIR
-    bin_path = target_dir / name
+    bin_path = binary_dir / name
     if example:
-        bin_path = target_dir / "examples" / example
+        bin_path = binary_dir / "examples" / example
     return bin_path