pipeline: merge test_sv_unit into test_sv_game

The test only takes a few seconds including engine startup,
most of the time was used in preparing the environment and
compiling the same binaries as used in test_sv_game.

Also removed a bashism for robustness.

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 464693215efe6c7931e4653215204647ed08ac85..89ac1ce360ab8700f2cbd6d0d1ec1129b8a9bf65 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -33,15 +33,23 @@ test_sv_game:
     - make qc || exit 1\r
 \r
     - mkdir -p data/maps\r
+    - wget -O data/maps/gitlab-ci.bsp https://gitlab.com/xonotic/xonotic-maps.pk3dir/raw/master/maps/_init/_init.bsp\r
+\r
+    - while read LINE; do\r
+        echo $LINE;\r
+        [ "$LINE" = "All tests OK" ] && PASS=1;\r
+      done < <(${ENGINE} +developer 1 +map gitlab-ci +sv_cmd runtest +wait +quit)\r
+    - test "$PASS" = "1" || { echo 'sv_cmd runtest failed!'; exit 1; }\r
+\r
+    - ${ENGINE} +map gitlab-ci +sv_cmd dumpnotifs +wait +quit\r
+    - diff notifications.cfg data/data/notifications_dump.cfg ||\r
+        { echo 'Please update notifications.cfg using `dumpnotifs`!'; exit 1; }\r
+\r
     - wget -O data/stormkeep.pk3 http://beta.xonotic.org/autobuild-bsp/latest/stormkeep.pk3\r
     - wget -O data/maps/stormkeep.mapinfo https://gitlab.com/xonotic/xonotic-maps.pk3dir/raw/master/maps/stormkeep.mapinfo\r
     - wget -O data/maps/stormkeep.waypoints https://gitlab.com/xonotic/xonotic-maps.pk3dir/raw/master/maps/stormkeep.waypoints\r
     - wget -O data/maps/stormkeep.waypoints.cache https://gitlab.com/xonotic/xonotic-maps.pk3dir/raw/master/maps/stormkeep.waypoints.cache\r
 \r
-    - ${ENGINE} +map stormkeep +dumpnotifs +wait +quit\r
-    - diff notifications.cfg data/data/notifications_dump.cfg ||\r
-        { echo 'Please update notifications.cfg using `dumpnotifs`!'; exit 1; }\r
-\r
     - EXPECT=d4060caf37a2e60bab68d1f83bc57368\r
     - HASH=$(${ENGINE} +timestamps 1 +exec serverbench.cfg\r
       | tee /dev/stderr\r
@@ -55,20 +63,6 @@ test_sv_game:
     - test "$HASH" == "$EXPECT"\r
     - exit $?\r
 \r
-test_sv_unit:\r
-  stage: test\r
-  script:\r
-    - git clone --depth=1 --branch=div0-stable https://gitlab.com/xonotic/darkplaces.git darkplaces\r
-    - cd darkplaces && make sv-release || exit 1\r
-    - export ENGINE="$PWD/darkplaces-dedicated -xonotic" && cd ..\r
-    - make qc || exit 1\r
-\r
-    - mkdir maps && wget -O maps/gitlab-ci.bsp https://gitlab.com/xonotic/xonotic-maps.pk3dir/raw/master/maps/_init/_init.bsp\r
-    - while read line; do\r
-        echo $line;\r
-        if [[ $line == "All tests OK" ]]; then exit 0; fi;\r
-      done < <(${ENGINE} +developer 1 +map gitlab-ci +sv_cmd runtest +exit)\r
-    - exit 1\r
 \r
 # NOTE: The generated docs are incomplete - they don't contain code behind SVQC CSQC MENUQC GAMEQC ifdefs.\r
 # With them added to PREDEFINED, it would take over half an hour to generate the docs and even then\r