From 6a1cb57542cd7c3922193be6549183399f106cef Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Wed, 23 Dec 2020 15:26:21 +0000 Subject: [PATCH] now our test daemon-otter starts up Signed-off-by: Ian Jackson --- wdriver.rs | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/wdriver.rs b/wdriver.rs index af55aa5a..0f8e8cb2 100644 --- a/wdriver.rs +++ b/wdriver.rs @@ -70,10 +70,10 @@ pub struct DirSubst { impl DirSubst { fn subst>(&self, s:S) -> String { - fn inner(_ds: &DirSubst, s: &str) -> String { + fn inner(ds: &DirSubst, s: &str) -> String { s - .replace("@target@", "../../") - .replace("@srcbbuild@","../../") + .replace("@target@", &format!("{}/target", &ds.start_dir)) + .replace("@srcbuild@", &ds.start_dir) } inner(self, s.as_ref()) } @@ -347,13 +347,11 @@ fn prepare_xserver(cln: &cleanup_notify::Handle, ds: &DirSubst) { #[throws(AE)] fn prepare_gameserver(cln: &cleanup_notify::Handle, ds: &DirSubst) { let config = ds.subst(r##" -base_dir = "." +public_url = "http://localhost:8000" +base_dir = "@srcbuild@" command_socket = "command.socket" -bundled_sources = "@target@/bundled-sources" save_dir = "." -template_dir = "@srcbuild@/templates" -wasm_dir = "@target@/packed-wasm" -shapelibs = [ "@srcbuild@/library/*.toml" ] +bundled_sources = "@target@/bundled-sources" [log] global_level = 'debug' -- 2.30.2