X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=.gitlab-ci.yml;h=1eb84dbe87c84c09730077b247ad28d409a56795;hp=fc4ce4ffff5d36693fedc43f255f7f70816102ca;hb=HEAD;hpb=21da5e8108d2f93f04e181f2a4d17f106a92edae

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index fc4ce4fff..7647566df 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -8,8 +8,6 @@ before_script:
   - ln -s $PWD data/xonotic-data.pk3dir
 
   - export MAKEFLAGS=-j$(nproc); echo MAKEFLAGS=$MAKEFLAGS
-#   FIXME: -march=native -mtune=native _changes the hash_, why?!?
-# - export CC="gcc -pipe -march=native -mtune=native"
   - export CC="gcc -pipe"
 
   - >
@@ -38,53 +36,8 @@ test_compilation_units:
 test_sv_game:
   stage: test
   script:
-    - >
-      if wget -nv https://beta.xonotic.org/pipeline-bin/xonotic-linux64-dedicated ; then
-        export ENGINE="$PWD/xonotic-linux64-dedicated"
-        chmod +x "$ENGINE"
-      else
-        git clone --depth=1 --branch=div0-stable https://gitlab.com/xonotic/darkplaces.git darkplaces
-        make -C darkplaces sv-release || exit 1
-        export ENGINE="$PWD/darkplaces/darkplaces-dedicated -xonotic"
-      fi
-    - export ENGINE="$ENGINE -noconfig -nohome"
-
-    - make qc || exit 1
-
-    - mkdir -p data/maps
-    - wget -nv -O data/maps/_init.bsp https://gitlab.com/xonotic/xonotic-maps.pk3dir/raw/master/maps/_init/_init.bsp
-
-    - while read LINE; do
-        echo $LINE;
-        [ "$LINE" = "All tests OK" ] && PASS=1;
-      done < <(${ENGINE} +developer 1 +map _init +sv_cmd runtest +wait +quit)
-    - test "$PASS" = "1" || { echo 'sv_cmd runtest failed!'; exit 1; }
-
-    - ${ENGINE} +map _init +sv_cmd dumpnotifs +wait +quit
-    - diff notifications.cfg data/data/notifications_dump.cfg ||
-        { echo 'Please update notifications.cfg using `dumpnotifs`!'; exit 1; }
-
-#    - wget -nv -O data/stormkeep.pk3 http://beta.xonotic.org/autobuild-bsp/latest/stormkeep.pk3
-# ^^ INCORRECT: /latest/stormkeep.pk3 is the most recently built, not necessarily the one built from master!
-# we can't get the one from master directly as there's no /stable/stormkeep.pk3 or /master/stormkeep.pk3
-# and we can't run misc/tools/xonotic-map-compiler-autobuild as it uses commit hashes from xonotic-maps.pk3dir to generate filenames
-# but the autobuild server can run it and provide us the resulting pk3:
-    - wget -nv -O data/stormkeep.pk3 https://beta.xonotic.org/pipeline-bin/stormkeep.pk3
-# see also: misc/infrastructure/xonotic-release-build.cron
-    - wget -nv -O data/maps/stormkeep.mapinfo https://gitlab.com/xonotic/xonotic-maps.pk3dir/raw/master/maps/stormkeep.mapinfo
-    - wget -nv -O data/maps/stormkeep.waypoints https://gitlab.com/xonotic/xonotic-maps.pk3dir/raw/master/maps/stormkeep.waypoints
-    - wget -nv -O data/maps/stormkeep.waypoints.cache https://gitlab.com/xonotic/xonotic-maps.pk3dir/raw/master/maps/stormkeep.waypoints.cache
-
-    - EXPECT=f69ef2a13dbe594a0284660e60bdc903
-    - HASH=$(${ENGINE} +exec serverbench.cfg
-      | tee /dev/stderr
-      | grep '^:'
-      | grep -v '^:gamestart:'
-      | grep -v '^:anticheat:'
-      | md5sum | awk '{ print $1 }')
-    - echo 'expected:' $EXPECT
-    - echo '  actual:' $HASH
-    - test "$HASH" == "$EXPECT"
+    - export EXPECT=ded5d54d7a8326069f5f3d015cee1bf2
+    - qcsrc/tools/sv_game-hashtest.sh
     - exit $?