diff options
| author | Florian Klink <flokli@flokli.de> | 2024-06-29T14·51+0300 |
|---|---|---|
| committer | flokli <flokli@flokli.de> | 2024-06-29T16·56+0000 |
| commit | 6cf8003fa17a0c9e9322faa9b050df97b588eb90 (patch) | |
| tree | 686a55d0349d4158a3cac4ce3f3d110521c553bc | |
| parent | 50ed7f27d092ab95bd7565ed000de3e4d23a9b7c (diff) | |
fix(tvix/boot/tests): escape addrs r/8325
Otherwise some URL parameters (containing &) might break the shell. We cannot use `$PWD` anymore, but that's statically known anyways. Change-Id: I739249111461ecdb33d42a48a4352f7612fce90f Reviewed-on: https://cl.tvl.fyi/c/depot/+/11894 Reviewed-by: Connor Brewster <cbrewster@hey.com> Autosubmit: flokli <flokli@flokli.de> Tested-by: BuildkiteCI
| -rw-r--r-- | tvix/boot/tests/default.nix | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/tvix/boot/tests/default.nix b/tvix/boot/tests/default.nix index 22f9de6bb5f7..785ff96570ab 100644 --- a/tvix/boot/tests/default.nix +++ b/tvix/boot/tests/default.nix @@ -58,9 +58,9 @@ let ${preStart} # Start the tvix daemon, listening on a unix socket. - BLOB_SERVICE_ADDR=${blobServiceAddr} \ - DIRECTORY_SERVICE_ADDR=${directoryServiceAddr} \ - PATH_INFO_SERVICE_ADDR=${pathInfoServiceAddr} \ + BLOB_SERVICE_ADDR=${lib.escapeShellArg blobServiceAddr} \ + DIRECTORY_SERVICE_ADDR=${lib.escapeShellArg directoryServiceAddr} \ + PATH_INFO_SERVICE_ADDR=${lib.escapeShellArg pathInfoServiceAddr} \ tvix-store \ --otlp=false \ daemon -l $PWD/tvix-store.sock & @@ -157,21 +157,21 @@ depot.nix.readTree.drvTargets importPathName = "docs"; }); docs-persistent = (mkBootTest { - blobServiceAddr = "objectstore+file://$PWD/blobs"; - directoryServiceAddr = "sled://$PWD/directories.sled"; - pathInfoServiceAddr = "sled://$PWD/pathinfo.sled"; + blobServiceAddr = "objectstore+file:///build/blobs"; + directoryServiceAddr = "sled:///build/directories.sled"; + pathInfoServiceAddr = "sled:///build/pathinfo.sled"; path = ../../docs; importPathName = "docs"; }); closure-tvix = (mkBootTest { - blobServiceAddr = "objectstore+file://$PWD/blobs"; + blobServiceAddr = "objectstore+file:///build/blobs"; path = depot.tvix.store; isClosure = true; }); closure-nixos = (mkBootTest { - blobServiceAddr = "objectstore+file://$PWD/blobs"; + blobServiceAddr = "objectstore+file:///build/blobs"; path = testSystem; isClosure = true; vmCmdline = "init=${testSystem}/init panic=-1"; # reboot immediately on panic @@ -179,7 +179,7 @@ depot.nix.readTree.drvTargets }); closure-nixos-nar-bridge = (mkBootTest { - blobServiceAddr = "objectstore+file://$PWD/blobs"; + blobServiceAddr = "objectstore+file:///build/blobs"; path = testSystem; useNarBridge = true; isClosure = true; |