From 960479de884fa1109c3e889873c1cb8921b25d2e Mon Sep 17 00:00:00 2001 From: Sebastien Bourdeauducq Date: Wed, 24 Apr 2019 11:21:06 +0800 Subject: [PATCH] do not set ARTIQ_LOW_LATENCY on Windows QEMU user networking + socat isn't low-latency. --- artiq/windows/default.nix | 2 +- main.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/artiq/windows/default.nix b/artiq/windows/default.nix index 8b21a85..1424656 100644 --- a/artiq/windows/default.nix +++ b/artiq/windows/default.nix @@ -23,6 +23,6 @@ stdenv.mkDerivation { installPhase = "touch $out"; doCheck = true; checkPhase = '' - ${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 + ${windowsRunner { testCommand = "set ARTIQ_ROOT=%cd%\\anaconda\\envs\\artiq-env\\Lib\\site-packages\\artiq\\examples\\kc705_nist_clock&&python -m unittest discover -v artiq.test"; }}/bin/run.sh ''; } diff --git a/main.nix b/main.nix index ea6a6e1..4e73da1 100644 --- a/main.nix +++ b/main.nix @@ -102,7 +102,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&&python -m unittest discover -v artiq.test.coredevice"; }}/bin/run.sh mkdir $out cp ${generatedNix}/pkgs/artiq-version.nix $out/passed3