From 96df81a4d0898e94635302f655afb903a3d4f6b4 Mon Sep 17 00:00:00 2001 From: Erik Arvstedt Date: Wed, 8 Dec 2021 04:07:30 +0100 Subject: [PATCH] run-tests: move `flake` next to other tests --- test/run-tests.sh | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/test/run-tests.sh b/test/run-tests.sh index a4cddfe..22d8803 100755 --- a/test/run-tests.sh +++ b/test/run-tests.sh @@ -246,6 +246,14 @@ vmTestNixExpr() { EOF } +flake() { + if [[ $(nix flake 2>&1) != *"requires a sub-command"* ]]; then + echo "Skipping flake test. Nix flake support is not enabled." + else + nix flake check "$scriptDir/.." + fi +} + # A basic subset of tests to keep the total runtime within # manageable bounds (<4 min on desktop systems). # These are also run on the CI server. @@ -275,14 +283,6 @@ examples() { (cd "$scriptDir/../examples" && nix-shell --run "$script") } -flake() { - if [[ $(nix flake 2>&1) != *"requires a sub-command"* ]]; then - echo "Skipping flake test. Nix flake support is not enabled." - else - nix flake check "$scriptDir/.." - fi -} - all() { buildable examples