Compare commits

..

2 Commits

Author SHA1 Message Date
Astro 90ad4cc31c windows tests: update instructions 2019-04-20 01:18:06 +02:00
Astro 287fb4a28b windows tests: capture failure, shutdown vm cleanly 2019-04-20 01:17:39 +02:00
2 changed files with 5 additions and 3 deletions

View File

@ -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
```

View File

@ -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
'';