Put flake functional tests in their own group

This is a nice thing to have, and it made it easier to work on the
Meson-ifcation of these functional tests too.
This commit is contained in:
John Ericson 2024-07-24 22:25:08 -04:00
parent dba1142c01
commit f4915af71c
3 changed files with 25 additions and 21 deletions

View File

@ -54,6 +54,7 @@ ifeq ($(ENABLE_FUNCTIONAL_TESTS), yes)
ifdef HOST_UNIX ifdef HOST_UNIX
makefiles += \ makefiles += \
tests/functional/local.mk \ tests/functional/local.mk \
tests/functional/flakes/local.mk \
tests/functional/ca/local.mk \ tests/functional/ca/local.mk \
tests/functional/git-hashing/local.mk \ tests/functional/git-hashing/local.mk \
tests/functional/dyn-drv/local.mk \ tests/functional/dyn-drv/local.mk \

View File

@ -0,0 +1,24 @@
flake-tests := \
$(d)/flakes.sh \
$(d)/develop.sh \
$(d)/edit.sh \
$(d)/run.sh \
$(d)/mercurial.sh \
$(d)/circular.sh \
$(d)/init.sh \
$(d)/inputs.sh \
$(d)/follow-paths.sh \
$(d)/bundle.sh \
$(d)/check.sh \
$(d)/unlocked-override.sh \
$(d)/absolute-paths.sh \
$(d)/absolute-attr-paths.sh \
$(d)/build-paths.sh \
$(d)/flake-in-submodule.sh \
$(d)/prefetch.sh \
$(d)/eval-cache.sh \
$(d)/search-root.sh \
$(d)/config.sh \
$(d)/show.sh
install-tests-groups += flake

View File

@ -1,23 +1,5 @@
nix_tests = \ nix_tests = \
test-infra.sh \ test-infra.sh \
flakes/flakes.sh \
flakes/develop.sh \
flakes/edit.sh \
flakes/run.sh \
flakes/mercurial.sh \
flakes/circular.sh \
flakes/init.sh \
flakes/inputs.sh \
flakes/follow-paths.sh \
flakes/bundle.sh \
flakes/check.sh \
flakes/unlocked-override.sh \
flakes/absolute-paths.sh \
flakes/absolute-attr-paths.sh \
flakes/build-paths.sh \
flakes/flake-in-submodule.sh \
flakes/prefetch.sh \
flakes/eval-cache.sh \
gc.sh \ gc.sh \
nix-collect-garbage-d.sh \ nix-collect-garbage-d.sh \
remote-store.sh \ remote-store.sh \
@ -61,7 +43,6 @@ nix_tests = \
restricted.sh \ restricted.sh \
fetchGitSubmodules.sh \ fetchGitSubmodules.sh \
fetchGitVerification.sh \ fetchGitVerification.sh \
flakes/search-root.sh \
readfile-context.sh \ readfile-context.sh \
nix-channel.sh \ nix-channel.sh \
recursive.sh \ recursive.sh \
@ -102,7 +83,6 @@ nix_tests = \
nix-copy-ssh-ng.sh \ nix-copy-ssh-ng.sh \
post-hook.sh \ post-hook.sh \
function-trace.sh \ function-trace.sh \
flakes/config.sh \
fmt.sh \ fmt.sh \
eval-store.sh \ eval-store.sh \
why-depends.sh \ why-depends.sh \
@ -125,7 +105,6 @@ nix_tests = \
store-info.sh \ store-info.sh \
fetchClosure.sh \ fetchClosure.sh \
completions.sh \ completions.sh \
flakes/show.sh \
impure-derivations.sh \ impure-derivations.sh \
path-from-hash-part.sh \ path-from-hash-part.sh \
path-info.sh \ path-info.sh \