windows tests: update instructions

artiq/windows/README.md

@@ -3,7 +3,7 @@
 ## Install a Windows image
 
 ```shell
-nix-build install.nix
+nix-build install.nix -I artiqSrc=…/artiq
 result/bin/windows-installer.sh
 ```
 
@@ -12,7 +12,6 @@ Follow the instructions.
 ## Install Anaconda to the image
 
 ```shell
-nix-build install.nix
 result/bin/anaconda-installer.sh
 ```
 

artiq/windows/run-test.nix

@@ -60,7 +60,8 @@ stdenv.mkDerivation {
     # Allow tests to run for 2 minutes
     ${ssh "shutdown -s -t ${toString testTimeout}"}
 
-    ${ssh "anaconda\\scripts\\activate ${condaEnv} && ${testCommand}"}
+    FAIL=n
+    ${ssh "anaconda\\scripts\\activate ${condaEnv} && ${testCommand}"} || FAIL=y
 
     # Abort timeouted shutdown
     ${ssh "shutdown -a"}
@@ -68,6 +69,8 @@ stdenv.mkDerivation {
     ${ssh "shutdown -p -f"}
     wait
 
+    [ "\\$FAIL" = "y" ] && exit 1
+
     EOF
     chmod a+x $out/bin/run.sh
   '';