diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2023-03-16 16:00:20 -0400 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2023-03-16 18:43:03 -0400 |
| commit | bfb9eb87fe98f96969188df9df866e15800bd55b (patch) | |
| tree | 1bb94f3b5aa283e9fd2c294a7bbd458eb6ba3950 /tests/linux-sandbox.sh | |
| parent | 7f46ebcf90432a54f5fdec1931d87e5130e68190 (diff) | |
Cleanup test skipping
- Try not to put cryptic "99" in many places
Factor out `exit 99` into `skipTest` function
- Alows make sure skipping a test is done with a reason
`skipTest` takes a mandatory argument
- Separate pure conditionals vs side-effectful test skipping.
"require daemon" already had this, but "sandbox support" did not.
Diffstat (limited to 'tests/linux-sandbox.sh')
| -rw-r--r-- | tests/linux-sandbox.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/linux-sandbox.sh b/tests/linux-sandbox.sh index 5667000d9..5a2cf7abd 100644 --- a/tests/linux-sandbox.sh +++ b/tests/linux-sandbox.sh @@ -4,13 +4,13 @@ needLocalStore "the sandbox only runs on the builder side, so it makes no sense clearStore -if ! canUseSandbox; then exit 99; fi +requireSandboxSupport # Note: we need to bind-mount $SHELL into the chroot. Currently we # only support the case where $SHELL is in the Nix store, because # otherwise things get complicated (e.g. if it's in /bin, do we need # /lib as well?). -if [[ ! $SHELL =~ /nix/store ]]; then exit 99; fi +if [[ ! $SHELL =~ /nix/store ]]; then skipTest "Shell is not from Nix store"; fi chmod -R u+w $TEST_ROOT/store0 || true rm -rf $TEST_ROOT/store0 |