From d89170c12901f1b62a87b360dec34e6820cb97cc Mon Sep 17 00:00:00 2001
From: sfan5 <sfan5@live.de>
Date: Sun, 18 Aug 2024 19:35:43 +0200
Subject: [PATCH] Simplify and fix docker test

---
 utils/test/run.sh   | 6 +++---
 utils/test/world.mt | 7 -------
 2 files changed, 3 insertions(+), 10 deletions(-)
 delete mode 100644 utils/test/world.mt

diff --git a/utils/test/run.sh b/utils/test/run.sh
index 284b2daf..fb4fa391 100755
--- a/utils/test/run.sh
+++ b/utils/test/run.sh
@@ -4,8 +4,7 @@ trap 'rm -rf "$world" || :' EXIT
 
 [ -f game.conf ] || { echo "Must be run in game root folder." >&2; exit 1; }
 
-cp -v utils/test/world.mt "$world/"
-chmod -R a+rwX "$world" # needed because server runs as unprivileged user inside container
+chmod -R 777 "$world" # container uses unprivileged user inside
 
 vol=(
 	-v "$PWD/utils/test/minetest.conf":/etc/minetest/minetest.conf
@@ -14,6 +13,7 @@ vol=(
 	-v "$world":/var/lib/minetest/.minetest/world
 )
 [ -z "$DOCKER_IMAGE" ] && DOCKER_IMAGE="ghcr.io/minetest/minetest:master"
-docker run --rm -i "${vol[@]}" "$DOCKER_IMAGE"
+docker run --rm -i "${vol[@]}" "$DOCKER_IMAGE" --config /etc/minetest/minetest.conf --gameid minetest
 
+test -f "$world/map.sqlite" || exit 1
 exit 0
diff --git a/utils/test/world.mt b/utils/test/world.mt
deleted file mode 100644
index d386d77a..00000000
--- a/utils/test/world.mt
+++ /dev/null
@@ -1,7 +0,0 @@
-auth_backend = sqlite3
-backend = sqlite3
-creative_mode = false
-enable_damage = true
-gameid = minetest
-mod_storage_backend = sqlite3
-player_backend = sqlite3