From 323f41b2afcceeb92afccc837090c9e6c8325623 Mon Sep 17 00:00:00 2001 From: Sebastien Bourdeauducq Date: Thu, 18 Apr 2019 14:55:39 +0800 Subject: [PATCH] windows: no-hardware tests also need sandbox escape for SSH into VM --- main.nix | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/main.nix b/main.nix index efc07e4..4b7095c 100644 --- a/main.nix +++ b/main.nix @@ -51,19 +51,6 @@ in constituents = builtins.attrValues jobs; }; - windows-no-hardware-tests = pkgs.stdenv.mkDerivation { - name = "windows-no-hardware-tests"; - src = ./.; - buildInputs = [ artiqpkgs.conda-artiq ]; - phases = [ "buildPhase" ]; - buildPhase = '' - ${windowsRunner {}}/bin/run.sh - - mkdir $out - touch $out/passed - ''; - }; - # HACK: Abuse fixed-output derivations to escape the sandbox and run the hardware # unit tests, all integrated in the Hydra interface. # One major downside of this hack is the tests are only run when generateTestOkHash @@ -102,7 +89,7 @@ in export ARTIQ_LOW_LATENCY=1 python -m unittest discover -v artiq.test.coredevice - ${windowsRunner { testCommand = "set ARTIQ_ROOT=%cd%\\anaconda\\envs\\artiq-env\\Lib\\site-packages\\artiq\\examples\\kc705_nist_clock&&set ARTIQ_LOW_LATENCY=1&&python -m unittest discover -v artiq.test.coredevice"; }}/bin/run.sh + ${windowsRunner { testCommand = "set ARTIQ_ROOT=%cd%\\anaconda\\envs\\artiq-env\\Lib\\site-packages\\artiq\\examples\\kc705_nist_clock&&set ARTIQ_LOW_LATENCY=1&&python -m unittest discover -v artiq.test"; }}/bin/run.sh mkdir $out cp ${generatedNix}/pkgs/artiq-version.nix $out/passed