Simplify and fix docker test

minetest · Aug 18, 2024 · d89170c · d89170c
1 parent 9bd1f24
commit d89170c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 10 deletions.
diff --git 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