about summary refs log tree commit diff
path: root/nixos
diff options
context:
space:
mode:
authoraszlig <aszlig@redmoonstudios.org>2016-01-16 01:01:28 +0100
committeraszlig <aszlig@redmoonstudios.org>2016-01-16 01:13:36 +0100
commit5caa8ab55e21349871ae0b762d5f5cfa63c8a777 (patch)
treecdb15b50c70f9f5fc1476116f9715ab32648b83e /nixos
parentc4de45b7ca1c129fdf48f713be8aade1b5ab6cc1 (diff)
downloadnixlib-5caa8ab55e21349871ae0b762d5f5cfa63c8a777.tar
nixlib-5caa8ab55e21349871ae0b762d5f5cfa63c8a777.tar.gz
nixlib-5caa8ab55e21349871ae0b762d5f5cfa63c8a777.tar.bz2
nixlib-5caa8ab55e21349871ae0b762d5f5cfa63c8a777.tar.lz
nixlib-5caa8ab55e21349871ae0b762d5f5cfa63c8a777.tar.xz
nixlib-5caa8ab55e21349871ae0b762d5f5cfa63c8a777.tar.zst
nixlib-5caa8ab55e21349871ae0b762d5f5cfa63c8a777.zip
nixos/tests/quake3: Don't quote +set arguments
With the new upstream Git version of ioquake3 introduced in 7fc7502, the
arguments to the quake3(server) binaries/wrappers may no longer be
passed as full single arguments (like "+set foo bar") but rather as
separate arguments (like "+set" "foo" "bar"), otherwise they will be
completely ignored.

Ran the x86_64-linux test on my machine and it now succeeds.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Diffstat (limited to 'nixos')
-rw-r--r--nixos/tests/quake3.nix8
1 files changed, 4 insertions, 4 deletions
diff --git a/nixos/tests/quake3.nix b/nixos/tests/quake3.nix
index 81a79b0b3e6d..b8a632c6e14d 100644
--- a/nixos/tests/quake3.nix
+++ b/nixos/tests/quake3.nix
@@ -45,8 +45,8 @@ rec {
         { systemd.services."quake3-server" =
             { wantedBy = [ "multi-user.target" ];
               script =
-                "${pkgs.quake3demo}/bin/quake3-server '+set g_gametype 0' " +
-                "'+map q3dm7' '+addbot grunt' '+addbot daemia' 2> /tmp/log";
+                "${pkgs.quake3demo}/bin/quake3-server +set g_gametype 0 " +
+                "+map q3dm7 +addbot grunt +addbot daemia 2> /tmp/log";
             };
           nixpkgs.config.packageOverrides = overrides;
           nixpkgs.config.allowUnfreePredicate = unfreePredicate;
@@ -65,8 +65,8 @@ rec {
       $client1->waitForX;
       $client2->waitForX;
 
-      $client1->execute("quake3 '+set r_fullscreen 0' '+set name Foo' '+connect server' &");
-      $client2->execute("quake3 '+set r_fullscreen 0' '+set name Bar' '+connect server' &");
+      $client1->execute("quake3 +set r_fullscreen 0 +set name Foo +connect server &");
+      $client2->execute("quake3 +set r_fullscreen 0 +set name Bar +connect server &");
 
       $server->waitUntilSucceeds("grep -q 'Foo.*entered the game' /tmp/log");
       $server->waitUntilSucceeds("grep -q 'Bar.*entered the game' /tmp/log");