forked from lix-project/lix
![John Ericson](/assets/img/avatar_default.png)
I think it is bad for these reasons when `tests/` contains a mix of functional and integration tests - Concepts is harder to understand, the documentation makes a good unit vs functional vs integration distinction, but when the integration tests are just two subdirs within `tests/` this is not clear. - Source filtering in the `flake.nix` is more complex. We need to filter out some of the dirs from `tests/`, rather than simply pick the dirs we want and take all of them. This is a good sign the structure of what we are trying to do is not matching the structure of the files. With this change we have a clean: ```shell-session $ git show 'HEAD:tests' tree HEAD:tests functional/ installer/ nixos/ ``` (cherry picked from commit 68c81c737571794f7246db53fb4774e94fcf4b7e)
30 lines
932 B
Bash
30 lines
932 B
Bash
export NIX_BIN_DIR=$(dirname $(type -p nix))
|
|
# TODO Get Nix and its closure more flexibly
|
|
export EXTRA_SANDBOX="/nix/store $(dirname $NIX_BIN_DIR)"
|
|
|
|
badStoreUrl () {
|
|
local altitude=$1
|
|
echo $TEST_ROOT/store-$altitude
|
|
}
|
|
|
|
goodStoreUrl () {
|
|
local altitude=$1
|
|
echo $("badStoreUrl" "$altitude")?store=/foo-$altitude
|
|
}
|
|
|
|
# The non-standard sandbox-build-dir helps ensure that we get the same behavior
|
|
# whether this test is being run in a derivation as part of the nix build or
|
|
# being manually run by a developer outside a derivation
|
|
runNixBuild () {
|
|
local storeFun=$1
|
|
local altitude=$2
|
|
nix-build \
|
|
--no-substitute --no-out-link \
|
|
--store "$("$storeFun" "$altitude")" \
|
|
--extra-sandbox-paths "$EXTRA_SANDBOX" \
|
|
./nested-sandboxing/runner.nix \
|
|
--arg altitude "$((altitude - 1))" \
|
|
--argstr storeFun "$storeFun" \
|
|
--sandbox-build-dir /build-non-standard
|
|
}
|