From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Wed, 23 Dec 2020 15:26:21 +0000 (+0000)
Subject: now our test daemon-otter starts up
X-Git-Tag: otter-0.2.0~144
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=6a1cb57542cd7c3922193be6549183399f106cef;p=otter.git

now our test daemon-otter starts up

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

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<S:AsRef<str>>(&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'