philipp/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Activity

nixos/tests/quake3: Don't quote +set arguments

Browse source 
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>
This commit is contained in:
aszlig 2016-01-16 01:01:28 +01:00
parent c4de45b7ca
commit 5caa8ab55e
No known key found for this signature in database
GPG key ID: D0EBD0EC8C2DC961
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
nixos/tests/quake3.nix
View file

@ -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");