run-tests.sh: extract `checkFlakeSupport`

Required by the following commit.
This commit is contained in:
Erik Arvstedt 2021-12-08 04:07:31 +01:00
parent 96df81a4d0
commit 77d8c00c53
No known key found for this signature in database
GPG Key ID: 33312B944DD97846
1 changed files with 18 additions and 5 deletions

View File

@ -246,12 +246,25 @@ vmTestNixExpr() {
EOF EOF
} }
flake() { checkFlakeSupport() {
if [[ $(nix flake 2>&1) != *"requires a sub-command"* ]]; then testName=$1
echo "Skipping flake test. Nix flake support is not enabled." if [[ ! -v hasFlakes ]]; then
else if [[ $(nix flake 2>&1) == *"requires a sub-command"* ]]; then
nix flake check "$scriptDir/.." hasFlakes=1
else
hasFlakes=
fi
fi fi
if [[ ! $hasFlakes ]]; then
echo "Skipping test '$testName'. Nix flake support is not enabled."
return 1
fi
}
flake() {
if ! checkFlakeSupport "flake"; then return; fi
nix flake check "$scriptDir/.."
} }
# A basic subset of tests to keep the total runtime within # A basic subset of tests to keep the total runtime within