Include stormkeep.waypoints.hardwired in hashtest

diff --git a/.gitignore b/.gitignore
index 86069d63def660981d90f2dd315662886d20c53a..83f1c3c65d7185f691d88a7508e99de66ea047db 100644 (file)
--- 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 7647566dfa204f82b38887843028af9c9c782574..590ab8175fc863df7ad0a4372948200658472958 100644 (file)
--- 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 980f1265ec07a83f7669c15c2d61fa773b000bfa..69a293b84e70c2fed474e18dc8140380bf713277 100755 (executable)
--- 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