From fd8215b77458f545fa0f6193f1e80e009e64a97e Mon Sep 17 00:00:00 2001 From: Stephan Maka Date: Mon, 22 Apr 2019 00:08:36 +0200 Subject: [PATCH] windows tests: doc --- artiq/windows/default.nix | 2 ++ artiq/windows/run-test.nix | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/artiq/windows/default.nix b/artiq/windows/default.nix index 52b3e7d..3377b10 100644 --- a/artiq/windows/default.nix +++ b/artiq/windows/default.nix @@ -1,3 +1,5 @@ +# This runs `run-test.nix` with `nix-build` + { pkgs ? import {}, diskImage ? "/opt/windows/c.img", qemuMem ? "2G", diff --git a/artiq/windows/run-test.nix b/artiq/windows/run-test.nix index 9b56a94..30d13d2 100644 --- a/artiq/windows/run-test.nix +++ b/artiq/windows/run-test.nix @@ -57,7 +57,7 @@ stdenv.mkDerivation { ${ssh "anaconda\\scripts\\activate ${condaEnv} && conda install artiq.tar.bz2"} done - # Allow tests to run for 2 minutes + # Schedule a timed shutdown against hanging test runs ${ssh "shutdown -s -t ${toString testTimeout}"} FAIL=n