chiark
/
gitweb
/
~ianmdlvl
/
otter.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
9994bd1
)
apitest: Split up prepare_gameserver
author
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Mon, 3 May 2021 23:02:56 +0000
(
00:02
+0100)
committer
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Mon, 3 May 2021 23:04:47 +0000
(
00:04
+0100)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
apitest/apitest.rs
patch
|
blob
|
history
diff --git
a/apitest/apitest.rs
b/apitest/apitest.rs
index 1186261b0d47a700b33b759732f0f0ef2154f5bd..93c779e3a203a512a961fde6a95f3e46edd34358 100644
(file)
--- a/
apitest/apitest.rs
+++ b/
apitest/apitest.rs
@@
-628,6
+628,12
@@
_ = "error" # rocket
fs::write(CONFIG, &config)
.context(CONFIG).context("create server config")?;
+ start_gameserver(cln, ds)?
+}
+
+#[throws(AE)]
+fn start_gameserver(cln: &cleanup_notify::Handle, ds: &DirSubst)
+ -> (MgmtChannel, Child) {
let server_exe = ds.subst("@target@/debug/daemon-otter")?;
let mut cmd = Command::new(&server_exe);
cmd