windows tests: use socat for forwardedPorts

2019-04-23 21:13:55 +02:00 · 2019-04-23 21:13:55 +02:00 · 5d7889357a
commit 5d7889357a
parent f6ebe4a88d
1 changed files with 2 additions and 3 deletions
--- a/artiq/windows/qemu.nix
+++ b/artiq/windows/qemu.nix
@ -15,12 +15,11 @@ let
        if isolateNetwork
        then "on"
        else "off";
-      nc = "${netcat}/bin/nc";
-      # use netcat instead of `tcp:…` to allow multiple connections
+      # use socat instead of `tcp:…` to allow multiple connections
      guestfwds =
        builtins.concatStringsSep ""
        (map ({ listenAddr, targetAddr, port }:
-          ",guestfwd=tcp:${listenAddr}:${toString port}-cmd:${nc}\\ ${targetAddr}\\ ${toString port}"
+          ",guestfwd=tcp:${listenAddr}:${toString port}-cmd:${socat}/bin/socat\\ -\\ tcp:${targetAddr}:${toString port}"
        ) forwardedPorts);
      args = [
        "-enable-kvm"