test: run Obnam binaries from where Cargo puts them

Sponsored-by: author

2 files changed, 7 insertions, 6 deletions

diff --git a/subplot/client.py b/subplot/client.py
index d0beba5..bea3b18 100644
--- a/subplot/client.py
+++ b/subplot/client.py
@@ -8,7 +8,10 @@ def install_obnam(ctx):
     srcdir = globals()["srcdir"]
 
     # Add the directory with built Rust binaries to the path.
-    runcmd_prepend_to_path(ctx, dirname=os.path.join(srcdir, "target", "debug"))
+    default_target = os.path.join(srcdir, "target")
+    target = os.environ.get("CARGO_TARGET_DIR", default_target)
+    runcmd_prepend_to_path(ctx, dirname=os.path.join(target, "debug"))
+    ctx["server-binary"] = os.path.join(target, "debug", "obnam-server")
 
 
 def uninstall_obnam(ctx):
diff --git a/subplot/server.py b/subplot/server.py
index 52ad8f4..2a3e397 100644
--- a/subplot/server.py
+++ b/subplot/server.py
@@ -33,9 +33,7 @@ def start_chunk_server(ctx, env=None):
         "address": f"localhost:{port}",
     }
 
-    server_binary = os.path.abspath(
-        os.path.join(srcdir, "target", "debug", "obnam-server")
-    )
+    server_binary = ctx["server-binary"]
 
     filename = "config.yaml"
     yaml.safe_dump(config, stream=open(filename, "w"))
@@ -44,8 +42,7 @@ def start_chunk_server(ctx, env=None):
     ctx["server_url"] = f"https://{config['address']}"
 
     daemon_start_on_port(
-        ctx, name="obnam-server", path=server_binary, args=filename, port=port,
-        env=env
+        ctx, name="obnam-server", path=server_binary, args=filename, port=port, env=env
     )
 
 
@@ -202,6 +199,7 @@ def _expand_vars(ctx, s):
         s = s[m.end() :]
     return "".join(result)
 
+
 def _server_stderr_contains(ctx, wanted):
     daemon_get_stderr = globals()["daemon_get_stderr"]