public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix tests that use the Valgrind docs

This commit is contained in:
Eelco Dolstra 2015-08-28 13:27:51 +02:00
parent 9d82f7e53e
commit 1852e65776
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/tests/firefox.nix
View File

@ -14,7 +14,7 @@ import ./make-test.nix ({ pkgs, ... }: {
testScript = testScript =
'' ''
$machine->waitForX; $machine->waitForX;
$machine->execute("firefox file://${pkgs.valgrind}/share/doc/valgrind/html/index.html &"); $machine->execute("firefox file://${pkgs.valgrind.doc}/share/doc/valgrind/html/index.html &");
$machine->waitForWindow(qr/Valgrind/); $machine->waitForWindow(qr/Valgrind/);
$machine->sleep(40); # wait until Firefox has finished loading the page $machine->sleep(40); # wait until Firefox has finished loading the page
$machine->screenshot("screen"); $machine->screenshot("screen");

2
nixos/tests/kde4.nix
View File

@ -15,7 +15,7 @@ import ./make-test.nix ({ pkgs, ... }: {
services.httpd.enable = true; services.httpd.enable = true;
services.httpd.adminAddr = "foo@example.org"; services.httpd.adminAddr = "foo@example.org";
services.httpd.documentRoot = "${pkgs.valgrind}/share/doc/valgrind/html"; services.httpd.documentRoot = "${pkgs.valgrind.doc}/share/doc/valgrind/html";
services.xserver.displayManager.kdm.enable = true; services.xserver.displayManager.kdm.enable = true;
services.xserver.displayManager.kdm.extraConfig = services.xserver.displayManager.kdm.extraConfig =

2
nixos/tests/proxy.nix
View File

@ -7,7 +7,7 @@ let
{ services.httpd.enable = true; { services.httpd.enable = true;
services.httpd.adminAddr = "foo@example.org"; services.httpd.adminAddr = "foo@example.org";
services.httpd.documentRoot = "${pkgs.valgrind}/share/doc/valgrind/html"; services.httpd.documentRoot = "${pkgs.valgrind.doc}/share/doc/valgrind/html";
networking.firewall.allowedTCPPorts = [ 80 ]; networking.firewall.allowedTCPPorts = [ 80 ];
}; };