From 5caa8ab55e21349871ae0b762d5f5cfa63c8a777 Mon Sep 17 00:00:00 2001 From: aszlig Date: Sat, 16 Jan 2016 01:01:28 +0100 Subject: [PATCH] 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 --- nixos/tests/quake3.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/nixos/tests/quake3.nix b/nixos/tests/quake3.nix index 81a79b0b3e6..b8a632c6e14 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");