diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2010-01-05 23:59:29 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2010-01-05 23:59:29 +0000 |
| commit | bc68c2985c961147affd47b914fef32fa07ebe21 (patch) | |
| tree | fbfc1b72b0d4241a5575bed4cd5ed686f153e67f /tests/quake3.nix | |
| parent | 5cc99487cbe337072f69ef3cd8b58c3f1aa16bcc (diff) | |
| download | nixpkgs-bc68c2985c961147affd47b914fef32fa07ebe21.tar nixpkgs-bc68c2985c961147affd47b914fef32fa07ebe21.tar.gz nixpkgs-bc68c2985c961147affd47b914fef32fa07ebe21.tar.bz2 nixpkgs-bc68c2985c961147affd47b914fef32fa07ebe21.tar.lz nixpkgs-bc68c2985c961147affd47b914fef32fa07ebe21.tar.xz nixpkgs-bc68c2985c961147affd47b914fef32fa07ebe21.tar.zst nixpkgs-bc68c2985c961147affd47b914fef32fa07ebe21.zip | |
* Added a function waitForX, which returns when the X server accepts
connections. * In the root shell, source /etc/bashrc and set $HOME and $DISPLAY. svn path=/nixos/trunk/; revision=19247
Diffstat (limited to 'tests/quake3.nix')
| -rw-r--r-- | tests/quake3.nix | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/tests/quake3.nix b/tests/quake3.nix index f743b9d8e91..e3a190dda7a 100644 --- a/tests/quake3.nix +++ b/tests/quake3.nix @@ -33,14 +33,11 @@ rec { startAll; $server->waitForJob("quake3-server"); - $client1->waitForFile("/tmp/.X11-unix/X0"); - $client2->waitForFile("/tmp/.X11-unix/X0"); + $client1->waitForX; + $client2->waitForX; - sleep 20; - - $client1->execute("DISPLAY=:0.0 quake3 '+set r_fullscreen 0' '+set name Foo' '+connect server' &"); - - $client2->execute("DISPLAY=:0.0 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' &"); sleep 40; |