pyrox.dev / nixpkgs
lol
fork atom

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>

aszlig 5caa8ab5 c4de45b7

options
unified split
Changed files
+4 -4
nixos
tests
quake3.nix
+4 -4
nixos/tests/quake3.nix 
···

       
45

       
 

       
        { systemd.services."quake3-server" =


     

       
46

       
 

       
            { wantedBy = [ "multi-user.target" ];


     

       
47

       
 

       
              script =


     

       
48

       
-

       
                "${pkgs.quake3demo}/bin/quake3-server '+set g_gametype 0' " +


     

       
49

       
-

       
                "'+map q3dm7' '+addbot grunt' '+addbot daemia' 2> /tmp/log";


     

       
50

       
 

       
            };


     

       
51

       
 

       
          nixpkgs.config.packageOverrides = overrides;


     

       
52

       
 

       
          nixpkgs.config.allowUnfreePredicate = unfreePredicate;


     
···

       
65

       
 

       
      $client1->waitForX;


     

       
66

       
 

       
      $client2->waitForX;


     

       
67

       
 

       



     

       
68

       
-

       
      $client1->execute("quake3 '+set r_fullscreen 0' '+set name Foo' '+connect server' &");


     

       
69

       
-

       
      $client2->execute("quake3 '+set r_fullscreen 0' '+set name Bar' '+connect server' &");


     

       
70

       
 

       



     

       
71

       
 

       
      $server->waitUntilSucceeds("grep -q 'Foo.*entered the game' /tmp/log");


     

       
72

       
 

       
      $server->waitUntilSucceeds("grep -q 'Bar.*entered the game' /tmp/log");


     
···

       
45

       
 

       
        { systemd.services."quake3-server" =


     

       
46

       
 

       
            { wantedBy = [ "multi-user.target" ];


     

       
47

       
 

       
              script =


     

       
48

       
+

       
                "${pkgs.quake3demo}/bin/quake3-server +set g_gametype 0 " +


     

       
49

       
+

       
                "+map q3dm7 +addbot grunt +addbot daemia 2> /tmp/log";


     

       
50

       
 

       
            };


     

       
51

       
 

       
          nixpkgs.config.packageOverrides = overrides;


     

       
52

       
 

       
          nixpkgs.config.allowUnfreePredicate = unfreePredicate;


     
···

       
65

       
 

       
      $client1->waitForX;


     

       
66

       
 

       
      $client2->waitForX;


     

       
67

       
 

       



     

       
68

       
+

       
      $client1->execute("quake3 +set r_fullscreen 0 +set name Foo +connect server &");


     

       
69

       
+

       
      $client2->execute("quake3 +set r_fullscreen 0 +set name Bar +connect server &");


     

       
70

       
 

       



     

       
71

       
 

       
      $server->waitUntilSucceeds("grep -q 'Foo.*entered the game' /tmp/log");


     

       
72

       
 

       
      $server->waitUntilSucceeds("grep -q 'Bar.*entered the game' /tmp/log");