maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(tvix/boot/tests): escape addrs

Browse source 
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
This commit is contained in:
Florian Klink 2024-06-29 17:51:59 +03:00 • committed by flokli
parent 50ed7f27d0
commit 6cf8003fa1
1 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

18
tvix/boot/tests/default.nix
View file

@ -58,9 +58,9 @@ let
${preStart} ${preStart}
# Start the tvix daemon, listening on a unix socket. # Start the tvix daemon, listening on a unix socket.
BLOB_SERVICE_ADDR=${blobServiceAddr} \ BLOB_SERVICE_ADDR=${lib.escapeShellArg blobServiceAddr} \
DIRECTORY_SERVICE_ADDR=${directoryServiceAddr} \ DIRECTORY_SERVICE_ADDR=${lib.escapeShellArg directoryServiceAddr} \
PATH_INFO_SERVICE_ADDR=${pathInfoServiceAddr} \ PATH_INFO_SERVICE_ADDR=${lib.escapeShellArg pathInfoServiceAddr} \
tvix-store \ tvix-store \
--otlp=false \ --otlp=false \
daemon -l $PWD/tvix-store.sock & daemon -l $PWD/tvix-store.sock &
@ -157,21 +157,21 @@ depot.nix.readTree.drvTargets
importPathName = "docs"; importPathName = "docs";
}); });
docs-persistent = (mkBootTest { docs-persistent = (mkBootTest {
blobServiceAddr = "objectstore+file://$PWD/blobs"; blobServiceAddr = "objectstore+file:///build/blobs";
directoryServiceAddr = "sled://$PWD/directories.sled"; directoryServiceAddr = "sled:///build/directories.sled";
pathInfoServiceAddr = "sled://$PWD/pathinfo.sled"; pathInfoServiceAddr = "sled:///build/pathinfo.sled";
path = ../../docs; path = ../../docs;
importPathName = "docs"; importPathName = "docs";
}); });
closure-tvix = (mkBootTest { closure-tvix = (mkBootTest {
blobServiceAddr = "objectstore+file://$PWD/blobs"; blobServiceAddr = "objectstore+file:///build/blobs";
path = depot.tvix.store; path = depot.tvix.store;
isClosure = true; isClosure = true;
}); });
closure-nixos = (mkBootTest { closure-nixos = (mkBootTest {
blobServiceAddr = "objectstore+file://$PWD/blobs"; blobServiceAddr = "objectstore+file:///build/blobs";
path = testSystem; path = testSystem;
isClosure = true; isClosure = true;
vmCmdline = "init=${testSystem}/init panic=-1"; # reboot immediately on panic vmCmdline = "init=${testSystem}/init panic=-1"; # reboot immediately on panic
@ -179,7 +179,7 @@ depot.nix.readTree.drvTargets
}); });
closure-nixos-nar-bridge = (mkBootTest { closure-nixos-nar-bridge = (mkBootTest {
blobServiceAddr = "objectstore+file://$PWD/blobs"; blobServiceAddr = "objectstore+file:///build/blobs";
path = testSystem; path = testSystem;
useNarBridge = true; useNarBridge = true;
isClosure = true; isClosure = true;