From 1852e65776b7789f9cd4f48f248112740ec4692f Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 28 Aug 2015 13:27:51 +0200
Subject: [PATCH] Fix tests that use the Valgrind docs
---
nixos/tests/firefox.nix | 2 +-
nixos/tests/kde4.nix | 2 +-
nixos/tests/proxy.nix | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/nixos/tests/firefox.nix b/nixos/tests/firefox.nix
index 67a2779afc24..1bdabe93fec1 100644
--- a/nixos/tests/firefox.nix
+++ b/nixos/tests/firefox.nix
@@ -14,7 +14,7 @@ import ./make-test.nix ({ pkgs, ... }: {
testScript =
''
$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->sleep(40); # wait until Firefox has finished loading the page
$machine->screenshot("screen");
diff --git a/nixos/tests/kde4.nix b/nixos/tests/kde4.nix
index 981813ba2bda..dc61658cd1c4 100644
--- a/nixos/tests/kde4.nix
+++ b/nixos/tests/kde4.nix
@@ -15,7 +15,7 @@ import ./make-test.nix ({ pkgs, ... }: {
services.httpd.enable = true;
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.extraConfig =
diff --git a/nixos/tests/proxy.nix b/nixos/tests/proxy.nix
index 1653c9b2fda7..b43ce1b8e680 100644
--- a/nixos/tests/proxy.nix
+++ b/nixos/tests/proxy.nix
@@ -7,7 +7,7 @@ let
{ services.httpd.enable = true;
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 ];
};