]> git.xonotic.org Git - xonotic/xonotic.git/commitdiff
Merge branch 'bones_was_here/improve-serverbench' into 'master'
authorMartin Taibr <taibr.martin@gmail.com>
Sun, 12 Apr 2020 22:52:54 +0000 (22:52 +0000)
committerMartin Taibr <taibr.martin@gmail.com>
Sun, 12 Apr 2020 22:52:54 +0000 (22:52 +0000)
Improve serverbench command WRT #273

- Use a temporary directory for the files previously created in the repo with -nohome (eg lock, data/data/defaultSVQC.cfg). This is better than just deleting the files as it will still work if the files created change, and won't annoy a user who is running their normal server or client with -nohome.
- Gitignore the temp directory, so it won't get committed if the serverbench was interrupted.
- Use dedicated instead of requiring it as an argument, previously without args it would run in threaded server mode which is considered unstable and doesn't run properly in this useage.

Resolves #273

See merge request xonotic/xonotic!62

1  2 
.gitignore
misc/tools/all/xonotic.subr

diff --cc .gitignore
Simple merge
Simple merge