From: Dr. Jaska <drjaska83@gmail.com>
Date: Tue, 23 Jul 2024 07:48:52 +0000 (+0000)
Subject: Include stormkeep.waypoints.hardwired in hashtest
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=ed2cd10e7422231878d8ba38d805ec6c20e0eaaa;p=xonotic%2Fxonotic-data.pk3dir.git

Include stormkeep.waypoints.hardwired in hashtest
---

diff --git a/.gitignore b/.gitignore
index 86069d63d..83f1c3c65 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,7 +9,4 @@ Thumbs.db
 # sv_game hashtest local test re-use
 data/maps/
 data/maps/_init.bsp
-data/maps/stormkeep.mapinfo
-data/maps/stormkeep.waypoints
-data/maps/stormkeep.waypoints.cache
 data/stormkeep.pk3
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7647566df..590ab8175 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -36,7 +36,7 @@ test_compilation_units:
 test_sv_game:
   stage: test
   script:
-    - export EXPECT=ded5d54d7a8326069f5f3d015cee1bf2
+    - export EXPECT=0406faebe1f4903266061f43557d0b1b
     - qcsrc/tools/sv_game-hashtest.sh
     - exit $?
 
diff --git a/qcsrc/tools/sv_game-hashtest.sh b/qcsrc/tools/sv_game-hashtest.sh
index 980f1265e..69a293b84 100755
--- a/qcsrc/tools/sv_game-hashtest.sh
+++ b/qcsrc/tools/sv_game-hashtest.sh
@@ -66,9 +66,6 @@ hashtestcleanup() {
 	rm -fv data/data/server.db
 	rm -dfv data/data/
 	#rm -fv data/maps/_init.bsp
-	#rm -fv data/maps/stormkeep.mapinfo
-	#rm -fv data/maps/stormkeep.waypoints
-	#rm -fv data/maps/stormkeep.waypoints.cache
 	#rm -dfv data/maps/
 
 	set -e
@@ -198,12 +195,6 @@ diff notifications.cfg data/data/notifications_dump.cfg ||
 
 createdtoday "data/stormkeep.pk3" \
 	|| wget -nv -O data/stormkeep.pk3 https://beta.xonotic.org/pipeline-bin/stormkeep.pk3
-createdtoday "data/maps/stormkeep.mapinfo" \
-	|| wget -nv -O data/maps/stormkeep.mapinfo https://gitlab.com/xonotic/xonotic-maps.pk3dir/raw/master/maps/stormkeep.mapinfo
-createdtoday "data/maps/stormkeep.waypoints" \
-	|| wget -nv -O data/maps/stormkeep.waypoints https://gitlab.com/xonotic/xonotic-maps.pk3dir/raw/master/maps/stormkeep.waypoints
-createdtoday "data/maps/stormkeep.waypoints.cache" \
-	|| wget -nv -O data/maps/stormkeep.waypoints.cache https://gitlab.com/xonotic/xonotic-maps.pk3dir/raw/master/maps/stormkeep.waypoints.cache
 
 if [ -z "${EXPECT-}" ]
 then