From eedc0b2527ba39e338a15abdfc4361194bc69c6a Mon Sep 17 00:00:00 2001 From: John Ericson Date: Wed, 16 Oct 2024 15:15:11 -0400 Subject: [PATCH] Move functional tests to subproject dir Everything that is a separate subproject should live in the subprojects directory. Progress on #2503 --- .github/labeler.yml | 2 +- .gitignore | 38 +-- .shellcheckrc | 2 +- CONTRIBUTING.md | 2 +- Makefile | 16 +- doc/manual/source/development/testing.md | 8 +- maintainers/flake-module.nix | 302 +++++++++--------- mk/common-test.sh | 2 +- package.nix | 2 +- src/libstore/gc.cc | 2 +- src/libutil/error.cc | 2 +- src/libutil/url-parts.hh | 2 +- src/nix-functional-tests | 1 - .../nix-functional-tests}/.version | 0 .../nix-functional-tests}/add.sh | 0 .../nix-functional-tests}/bash-profile.sh | 0 .../big-derivation-attr.nix | 0 .../binary-cache-build-remote.sh | 0 .../nix-functional-tests}/binary-cache.sh | 0 .../nix-functional-tests}/brotli.sh | 0 .../nix-functional-tests}/build-delete.sh | 0 .../nix-functional-tests}/build-dry.sh | 0 .../build-hook-ca-fixed.nix | 0 .../build-hook-ca-floating.nix | 0 .../nix-functional-tests}/build-hook.nix | 0 .../build-remote-content-addressed-fixed.sh | 0 ...build-remote-content-addressed-floating.sh | 0 .../build-remote-input-addressed.sh | 0 .../build-remote-trustless-after.sh | 0 .../build-remote-trustless-should-fail-0.sh | 0 .../build-remote-trustless-should-pass-0.sh | 0 .../build-remote-trustless-should-pass-1.sh | 0 .../build-remote-trustless-should-pass-2.sh | 0 .../build-remote-trustless-should-pass-3.sh | 0 .../build-remote-trustless.sh | 2 +- .../build-remote-with-mounted-ssh-ng.sh | 0 .../nix-functional-tests}/build-remote.sh | 0 .../nix-functional-tests}/build.sh | 0 .../nix-functional-tests}/ca-shell.nix | 0 .../nix-functional-tests}/ca/build-cache.sh | 0 .../nix-functional-tests}/ca/build-dry.sh | 0 .../ca/build-with-garbage-path.sh | 0 .../nix-functional-tests}/ca/build.sh | 0 .../nix-functional-tests}/ca/common.sh | 0 .../ca/concurrent-builds.sh | 0 .../nix-functional-tests}/ca/config.nix.in | 0 .../ca/content-addressed.nix | 0 .../ca/derivation-json.sh | 0 .../ca/duplicate-realisation-in-closure.sh | 0 .../nix-functional-tests}/ca/eval-store.sh | 0 .../nix-functional-tests}/ca/flake.nix | 0 .../nix-functional-tests}/ca/gc.sh | 0 .../ca/import-from-derivation.sh | 0 .../nix-functional-tests}/ca/local.mk | 2 +- .../nix-functional-tests}/ca/meson.build | 0 .../nix-functional-tests}/ca/new-build-cmd.sh | 0 .../nix-functional-tests}/ca/nix-copy.sh | 0 .../nix-functional-tests}/ca/nix-run.sh | 0 .../nix-functional-tests}/ca/nix-shell.sh | 0 .../ca/nondeterministic.nix | 0 .../nix-functional-tests}/ca/post-hook.sh | 0 .../nix-functional-tests}/ca/racy.nix | 0 .../nix-functional-tests}/ca/recursive.sh | 0 .../nix-functional-tests}/ca/repl.sh | 0 .../nix-functional-tests}/ca/selfref-gc.sh | 0 .../nix-functional-tests}/ca/signatures.sh | 0 .../nix-functional-tests}/ca/substitute.sh | 0 .../nix-functional-tests}/ca/why-depends.sh | 0 .../nix-functional-tests}/case-collision.nar | Bin .../nix-functional-tests}/case.nar | Bin .../characterisation-test-infra.sh | 0 .../characterisation/empty | 0 .../characterisation/framework.sh | 2 +- .../nix-functional-tests}/check-refs.nix | 0 .../nix-functional-tests}/check-refs.sh | 0 .../nix-functional-tests}/check-reqs.nix | 0 .../nix-functional-tests}/check-reqs.sh | 0 .../nix-functional-tests}/check.nix | 0 .../nix-functional-tests}/check.sh | 0 .../nix-functional-tests}/chroot-store.sh | 0 .../nix-functional-tests}/common.sh | 0 .../nix-functional-tests}/common/functions.sh | 0 .../nix-functional-tests}/common/init.sh | 0 .../nix-functional-tests}/common/meson.build | 0 .../nix-functional-tests}/common/paths.sh | 0 .../common/subst-vars.sh.in | 0 .../nix-functional-tests}/common/test-root.sh | 0 .../nix-functional-tests}/common/vars.sh | 0 .../nix-functional-tests}/completions.sh | 0 .../compression-levels.sh | 0 .../nix-functional-tests}/compute-levels.sh | 0 .../nix-functional-tests}/config.nix.in | 0 .../nix-functional-tests}/config.sh | 0 .../config/extra-config.conf | 0 .../config/nix-with-bang-include.conf | 0 .../config/nix-with-include.conf | 0 .../config/nix-with-substituters.conf | 0 .../nix-functional-tests}/db-migration.sh | 0 .../nix-functional-tests}/debugger.sh | 0 .../dependencies.builder0.sh | 0 .../nix-functional-tests}/dependencies.nix | 0 .../nix-functional-tests}/dependencies.sh | 0 .../derivation-advanced-attributes.sh | 0 .../nix-functional-tests}/derivation-json.sh | 0 .../advanced-attributes-defaults.drv | 0 .../advanced-attributes-defaults.nix | 0 ...d-attributes-structured-attrs-defaults.drv | 0 ...d-attributes-structured-attrs-defaults.nix | 0 .../advanced-attributes-structured-attrs.drv | 0 .../advanced-attributes-structured-attrs.nix | 0 .../derivation/advanced-attributes.drv | 0 .../derivation/advanced-attributes.nix | 0 .../nix-functional-tests}/dot.nar | Bin .../nix-functional-tests}/dotdot.nar | Bin .../nix-functional-tests}/dummy | 0 .../nix-functional-tests}/dump-db.sh | 0 .../nix-functional-tests}/duplicate.nar | Bin .../dyn-drv/build-built-drv.sh | 0 .../nix-functional-tests}/dyn-drv/common.sh | 0 .../dyn-drv/config.nix.in | 0 .../dyn-drv/dep-built-drv.sh | 0 .../dyn-drv/eval-outputOf.sh | 0 .../nix-functional-tests}/dyn-drv/local.mk | 2 +- .../nix-functional-tests}/dyn-drv/meson.build | 0 .../dyn-drv/old-daemon-error-hack.nix | 0 .../dyn-drv/old-daemon-error-hack.sh | 0 .../dyn-drv/recursive-mod-json.nix | 0 .../dyn-drv/recursive-mod-json.sh | 0 .../dyn-drv/text-hashed-output.nix | 0 .../dyn-drv/text-hashed-output.sh | 0 .../nix-functional-tests}/empty.nar | Bin .../nix-functional-tests}/eval-store.sh | 0 .../nix-functional-tests}/eval.nix | 0 .../nix-functional-tests}/eval.sh | 0 .../executable-after-contents.nar | Bin .../experimental-features.sh | 0 .../nix-functional-tests}/export-graph.nix | 0 .../nix-functional-tests}/export-graph.sh | 0 .../nix-functional-tests}/export.sh | 0 .../extra-sandbox-profile.nix | 0 .../extra-sandbox-profile.sh | 0 .../nix-functional-tests}/failing.nix | 0 .../nix-functional-tests}/fetchClosure.sh | 0 .../nix-functional-tests}/fetchGit.sh | 0 .../nix-functional-tests}/fetchGitRefs.sh | 0 .../fetchGitSubmodules.sh | 0 .../fetchGitVerification.sh | 0 .../nix-functional-tests}/fetchMercurial.sh | 0 .../nix-functional-tests}/fetchPath.sh | 0 .../nix-functional-tests}/fetchTree-file.sh | 0 .../nix-functional-tests}/fetchurl.sh | 0 .../nix-functional-tests}/filter-source.nix | 0 .../nix-functional-tests}/filter-source.sh | 0 .../nix-functional-tests}/fixed.builder1.sh | 0 .../nix-functional-tests}/fixed.builder2.sh | 0 .../nix-functional-tests}/fixed.nix | 0 .../nix-functional-tests}/fixed.sh | 0 .../flakes/absolute-attr-paths.sh | 0 .../flakes/absolute-paths.sh | 0 .../flakes/build-paths.sh | 0 .../nix-functional-tests}/flakes/bundle.sh | 0 .../nix-functional-tests}/flakes/check.sh | 0 .../nix-functional-tests}/flakes/circular.sh | 0 .../nix-functional-tests}/flakes/common.sh | 0 .../nix-functional-tests}/flakes/config.sh | 0 .../nix-functional-tests}/flakes/develop.sh | 0 .../flakes/dubious-query.sh | 0 .../nix-functional-tests}/flakes/edit.sh | 0 .../flakes/eval-cache.sh | 0 .../flakes/flake-in-submodule.sh | 0 .../nix-functional-tests}/flakes/flakes.sh | 0 .../flakes/follow-paths.sh | 0 .../nix-functional-tests}/flakes/init.sh | 0 .../nix-functional-tests}/flakes/inputs.sh | 0 .../nix-functional-tests}/flakes/local.mk | 0 .../nix-functional-tests}/flakes/mercurial.sh | 0 .../nix-functional-tests}/flakes/meson.build | 0 .../nix-functional-tests}/flakes/prefetch.sh | 0 .../nix-functional-tests}/flakes/run.sh | 0 .../flakes/search-root.sh | 0 .../nix-functional-tests}/flakes/show.sh | 0 .../nix-functional-tests}/flakes/tree.zip | Bin .../flakes/unlocked-override.sh | 0 .../nix-functional-tests}/fmt.sh | 0 .../nix-functional-tests}/fmt.simple.sh | 0 .../nix-functional-tests}/fod-failing.nix | 0 .../nix-functional-tests}/function-trace.sh | 0 .../nix-functional-tests}/gc-auto.sh | 0 .../gc-concurrent.builder.sh | 0 .../nix-functional-tests}/gc-concurrent.nix | 0 .../nix-functional-tests}/gc-concurrent.sh | 0 .../gc-concurrent2.builder.sh | 0 .../nix-functional-tests}/gc-non-blocking.sh | 0 .../nix-functional-tests}/gc-runtime.nix | 0 .../nix-functional-tests}/gc-runtime.sh | 0 .../nix-functional-tests}/gc.sh | 0 .../git-hashing/common.sh | 0 .../git-hashing/local.mk | 0 .../git-hashing/meson.build | 0 .../git-hashing/simple.sh | 0 .../nix-functional-tests}/hash-check.nix | 0 .../nix-functional-tests}/hash-convert.sh | 0 .../nix-functional-tests}/hash-path.sh | 0 .../nix-functional-tests}/help.sh | 0 .../nix-functional-tests}/hermetic.nix | 0 .../nix-functional-tests}/ifd.nix | 0 .../import-from-derivation.nix | 0 .../import-from-derivation.sh | 0 .../impure-derivations.nix | 0 .../impure-derivations.sh | 0 .../nix-functional-tests}/impure-env.nix | 0 .../nix-functional-tests}/impure-env.sh | 0 .../nix-functional-tests}/impure-eval.sh | 0 .../nix-functional-tests}/install-darwin.sh | 0 .../nix-functional-tests}/lang-gc.sh | 0 .../lang-gc/issue-11141-gc-coroutine-test.nix | 0 .../nix-functional-tests}/lang.sh | 0 .../nix-functional-tests}/lang/binary-data | Bin .../nix-functional-tests}/lang/data | 0 .../nix-functional-tests}/lang/dir1/a.nix | 0 .../nix-functional-tests}/lang/dir2/a.nix | 0 .../nix-functional-tests}/lang/dir2/b.nix | 0 .../nix-functional-tests}/lang/dir3/a.nix | 0 .../nix-functional-tests}/lang/dir3/b.nix | 0 .../nix-functional-tests}/lang/dir3/c.nix | 0 .../nix-functional-tests}/lang/dir4/a.nix | 0 .../nix-functional-tests}/lang/dir4/c.nix | 0 .../lang/eval-fail-abort.err.exp | 0 .../lang/eval-fail-abort.nix | 0 ...rvOutputDependencies-empty-context.err.exp | 0 ...addDrvOutputDependencies-empty-context.nix | 0 ...putDependencies-multi-elem-context.err.exp | 0 ...vOutputDependencies-multi-elem-context.nix | 0 ...putDependencies-wrong-element-kind.err.exp | 0 ...vOutputDependencies-wrong-element-kind.nix | 0 .../eval-fail-addErrorContext-example.err.exp | 0 .../eval-fail-addErrorContext-example.flags | 0 .../eval-fail-addErrorContext-example.nix | 0 ...al-fail-assert-equal-attrs-names-2.err.exp | 0 .../eval-fail-assert-equal-attrs-names-2.nix | 0 ...eval-fail-assert-equal-attrs-names.err.exp | 0 .../eval-fail-assert-equal-attrs-names.nix | 0 ...ail-assert-equal-derivations-extra.err.exp | 0 ...al-fail-assert-equal-derivations-extra.nix | 0 ...eval-fail-assert-equal-derivations.err.exp | 0 .../eval-fail-assert-equal-derivations.nix | 0 .../eval-fail-assert-equal-floats.err.exp | 0 .../lang/eval-fail-assert-equal-floats.nix | 0 ...-fail-assert-equal-function-direct.err.exp | 0 ...eval-fail-assert-equal-function-direct.nix | 0 .../eval-fail-assert-equal-int-float.err.exp | 0 .../lang/eval-fail-assert-equal-int-float.nix | 0 .../lang/eval-fail-assert-equal-ints.err.exp | 0 .../lang/eval-fail-assert-equal-ints.nix | 0 ...eval-fail-assert-equal-list-length.err.exp | 0 .../eval-fail-assert-equal-list-length.nix | 0 .../lang/eval-fail-assert-equal-paths.err.exp | 0 .../lang/eval-fail-assert-equal-paths.nix | 0 ...eval-fail-assert-equal-type-nested.err.exp | 0 .../eval-fail-assert-equal-type-nested.nix | 0 .../lang/eval-fail-assert-equal-type.err.exp | 0 .../lang/eval-fail-assert-equal-type.nix | 0 .../lang/eval-fail-assert-nested-bool.err.exp | 0 .../lang/eval-fail-assert-nested-bool.nix | 0 .../lang/eval-fail-assert.err.exp | 0 .../lang/eval-fail-assert.nix | 0 .../lang/eval-fail-attr-name-type.err.exp | 0 .../lang/eval-fail-attr-name-type.nix | 0 ...al-fail-bad-string-interpolation-1.err.exp | 0 .../eval-fail-bad-string-interpolation-1.nix | 0 ...al-fail-bad-string-interpolation-2.err.exp | 0 .../eval-fail-bad-string-interpolation-2.nix | 0 ...al-fail-bad-string-interpolation-3.err.exp | 0 .../eval-fail-bad-string-interpolation-3.nix | 0 ...al-fail-bad-string-interpolation-4.err.exp | 0 .../eval-fail-bad-string-interpolation-4.nix | 0 .../lang/eval-fail-blackhole.err.exp | 0 .../lang/eval-fail-blackhole.nix | 0 .../lang/eval-fail-call-primop.err.exp | 0 .../lang/eval-fail-call-primop.nix | 0 .../lang/eval-fail-deepseq.err.exp | 0 .../lang/eval-fail-deepseq.nix | 0 .../lang/eval-fail-derivation-name.err.exp | 0 .../lang/eval-fail-derivation-name.nix | 0 .../eval-fail-derivation-name.postprocess | 0 .../lang/eval-fail-dup-dynamic-attrs.err.exp | 0 .../lang/eval-fail-dup-dynamic-attrs.nix | 0 .../lang/eval-fail-duplicate-traces.err.exp | 0 .../lang/eval-fail-duplicate-traces.nix | 0 .../lang/eval-fail-eol-1.err.exp | 0 .../lang/eval-fail-eol-1.nix | 0 .../lang/eval-fail-eol-2.err.exp | 0 .../lang/eval-fail-eol-2.nix | 0 .../lang/eval-fail-eol-3.err.exp | 0 .../lang/eval-fail-eol-3.nix | 0 .../lang/eval-fail-fetchTree-negative.err.exp | 0 .../lang/eval-fail-fetchTree-negative.nix | 0 ...-fail-fetchurl-baseName-attrs-name.err.exp | 0 ...eval-fail-fetchurl-baseName-attrs-name.nix | 0 .../eval-fail-fetchurl-baseName-attrs.err.exp | 0 .../eval-fail-fetchurl-baseName-attrs.nix | 0 .../lang/eval-fail-fetchurl-baseName.err.exp | 0 .../lang/eval-fail-fetchurl-baseName.nix | 0 ...ake-ref-to-string-negative-integer.err.exp | 0 ...l-flake-ref-to-string-negative-integer.nix | 0 ...-foldlStrict-strict-op-application.err.exp | 0 ...fail-foldlStrict-strict-op-application.nix | 0 .../eval-fail-fromJSON-overflowing.err.exp | 0 .../lang/eval-fail-fromJSON-overflowing.nix | 0 .../eval-fail-fromTOML-timestamps.err.exp | 0 .../lang/eval-fail-fromTOML-timestamps.nix | 0 .../lang/eval-fail-hashfile-missing.err.exp | 0 .../lang/eval-fail-hashfile-missing.nix | 0 ...val-fail-infinite-recursion-lambda.err.exp | 0 .../eval-fail-infinite-recursion-lambda.flags | 0 .../eval-fail-infinite-recursion-lambda.nix | 0 .../lang/eval-fail-list.err.exp | 0 .../lang/eval-fail-list.nix | 0 .../lang/eval-fail-missing-arg.err.exp | 0 .../lang/eval-fail-missing-arg.nix | 0 .../lang/eval-fail-mutual-recursion.err.exp | 0 .../lang/eval-fail-mutual-recursion.nix | 0 .../lang/eval-fail-nested-list-items.err.exp | 0 .../lang/eval-fail-nested-list-items.nix | 0 .../lang/eval-fail-nonexist-path.err.exp | 0 .../lang/eval-fail-nonexist-path.nix | 0 .../lang/eval-fail-not-throws.err.exp | 0 .../lang/eval-fail-not-throws.nix | 0 .../lang/eval-fail-overflowing-add.err.exp | 0 .../lang/eval-fail-overflowing-add.nix | 0 .../lang/eval-fail-overflowing-div.err.exp | 0 .../lang/eval-fail-overflowing-div.nix | 0 .../lang/eval-fail-overflowing-mul.err.exp | 0 .../lang/eval-fail-overflowing-mul.nix | 0 .../lang/eval-fail-overflowing-sub.err.exp | 0 .../lang/eval-fail-overflowing-sub.nix | 0 .../lang/eval-fail-path-slash.err.exp | 0 .../lang/eval-fail-path-slash.nix | 0 .../lang/eval-fail-pipe-operators.err.exp | 0 .../lang/eval-fail-pipe-operators.nix | 0 .../lang/eval-fail-recursion.err.exp | 0 .../lang/eval-fail-recursion.nix | 0 .../lang/eval-fail-remove.err.exp | 0 .../lang/eval-fail-remove.nix | 0 .../lang/eval-fail-scope-5.err.exp | 0 .../lang/eval-fail-scope-5.nix | 0 .../lang/eval-fail-seq.err.exp | 0 .../lang/eval-fail-seq.nix | 0 .../lang/eval-fail-set-override.err.exp | 0 .../lang/eval-fail-set-override.nix | 0 .../lang/eval-fail-set.err.exp | 0 .../lang/eval-fail-set.nix | 0 .../lang/eval-fail-substring.err.exp | 0 .../lang/eval-fail-substring.nix | 0 .../lang/eval-fail-to-path.err.exp | 0 .../lang/eval-fail-to-path.nix | 0 .../lang/eval-fail-toJSON.err.exp | 0 .../lang/eval-fail-toJSON.nix | 0 .../lang/eval-fail-undeclared-arg.err.exp | 0 .../lang/eval-fail-undeclared-arg.nix | 0 .../eval-fail-using-set-as-attr-name.err.exp | 0 .../lang/eval-fail-using-set-as-attr-name.nix | 0 .../lang/eval-okay-any-all.exp | 0 .../lang/eval-okay-any-all.nix | 0 .../lang/eval-okay-arithmetic.exp | 0 .../lang/eval-okay-arithmetic.nix | 0 .../lang/eval-okay-attrnames.exp | 0 .../lang/eval-okay-attrnames.nix | 0 .../lang/eval-okay-attrs.exp | 0 .../lang/eval-okay-attrs.nix | 0 .../lang/eval-okay-attrs2.exp | 0 .../lang/eval-okay-attrs2.nix | 0 .../lang/eval-okay-attrs3.exp | 0 .../lang/eval-okay-attrs3.nix | 0 .../lang/eval-okay-attrs4.exp | 0 .../lang/eval-okay-attrs4.nix | 0 .../lang/eval-okay-attrs5.exp | 0 .../lang/eval-okay-attrs5.nix | 0 .../lang/eval-okay-attrs6.exp | 0 .../lang/eval-okay-attrs6.nix | 0 .../lang/eval-okay-autoargs.exp | 0 .../lang/eval-okay-autoargs.flags | 0 .../lang/eval-okay-autoargs.nix | 0 .../lang/eval-okay-backslash-newline-1.exp | 0 .../lang/eval-okay-backslash-newline-1.nix | 0 .../lang/eval-okay-backslash-newline-2.exp | 0 .../lang/eval-okay-backslash-newline-2.nix | 0 .../lang/eval-okay-baseNameOf.exp | 0 .../lang/eval-okay-baseNameOf.nix | 0 .../lang/eval-okay-builtins-add.exp | 0 .../lang/eval-okay-builtins-add.nix | 0 .../lang/eval-okay-builtins.exp | 0 .../lang/eval-okay-builtins.nix | 0 .../lang/eval-okay-callable-attrs.exp | 0 .../lang/eval-okay-callable-attrs.nix | 0 .../lang/eval-okay-catattrs.exp | 0 .../lang/eval-okay-catattrs.nix | 0 .../lang/eval-okay-closure.exp | 0 .../lang/eval-okay-closure.exp.xml | 0 .../lang/eval-okay-closure.nix | 0 .../lang/eval-okay-comments.exp | 0 .../lang/eval-okay-comments.nix | 0 .../lang/eval-okay-concat.exp | 0 .../lang/eval-okay-concat.nix | 0 .../lang/eval-okay-concatmap.exp | 0 .../lang/eval-okay-concatmap.nix | 0 .../lang/eval-okay-concatstringssep.exp | 0 .../lang/eval-okay-concatstringssep.nix | 0 .../lang/eval-okay-context-introspection.exp | 0 .../lang/eval-okay-context-introspection.nix | 0 .../lang/eval-okay-context.exp | 0 .../lang/eval-okay-context.nix | 0 .../lang/eval-okay-convertHash.err.exp | 0 .../lang/eval-okay-convertHash.exp | 0 .../lang/eval-okay-convertHash.nix | 0 .../lang/eval-okay-curpos.exp | 0 .../lang/eval-okay-curpos.nix | 0 .../lang/eval-okay-deepseq.exp | 0 .../lang/eval-okay-deepseq.nix | 0 .../lang/eval-okay-delayed-with-inherit.exp | 0 .../lang/eval-okay-delayed-with-inherit.nix | 0 .../lang/eval-okay-delayed-with.exp | 0 .../lang/eval-okay-delayed-with.nix | 0 .../eval-okay-deprecate-cursed-or.err.exp | 0 .../lang/eval-okay-deprecate-cursed-or.exp | 0 .../lang/eval-okay-deprecate-cursed-or.nix | 0 .../lang/eval-okay-derivation-legacy.err.exp | 0 .../lang/eval-okay-derivation-legacy.exp | 0 .../lang/eval-okay-derivation-legacy.nix | 0 .../lang/eval-okay-dynamic-attrs-2.exp | 0 .../lang/eval-okay-dynamic-attrs-2.nix | 0 .../lang/eval-okay-dynamic-attrs-bare.exp | 0 .../lang/eval-okay-dynamic-attrs-bare.nix | 0 .../lang/eval-okay-dynamic-attrs.exp | 0 .../lang/eval-okay-dynamic-attrs.nix | 0 .../lang/eval-okay-elem.exp | 0 .../lang/eval-okay-elem.nix | 0 .../lang/eval-okay-empty-args.exp | 0 .../lang/eval-okay-empty-args.nix | 0 .../lang/eval-okay-eq-derivations.exp | 0 .../lang/eval-okay-eq-derivations.nix | 0 .../lang/eval-okay-eq.exp | 0 .../lang/eval-okay-eq.nix | 0 .../lang/eval-okay-filter.exp | 0 .../lang/eval-okay-filter.nix | 0 .../lang/eval-okay-flake-ref-to-string.exp | 0 .../lang/eval-okay-flake-ref-to-string.nix | 0 .../lang/eval-okay-flatten.exp | 0 .../lang/eval-okay-flatten.nix | 0 .../lang/eval-okay-float.exp | 0 .../lang/eval-okay-float.nix | 0 .../lang/eval-okay-floor-ceil.exp | 0 .../lang/eval-okay-floor-ceil.nix | 0 .../eval-okay-foldlStrict-lazy-elements.exp | 0 .../eval-okay-foldlStrict-lazy-elements.nix | 0 ...y-foldlStrict-lazy-initial-accumulator.exp | 0 ...y-foldlStrict-lazy-initial-accumulator.nix | 0 .../lang/eval-okay-foldlStrict.exp | 0 .../lang/eval-okay-foldlStrict.nix | 0 .../lang/eval-okay-fromTOML-timestamps.exp | 0 .../lang/eval-okay-fromTOML-timestamps.flags | 0 .../lang/eval-okay-fromTOML-timestamps.nix | 0 .../lang/eval-okay-fromTOML.exp | 0 .../lang/eval-okay-fromTOML.nix | 0 .../lang/eval-okay-fromjson-escapes.exp | 0 .../lang/eval-okay-fromjson-escapes.nix | 0 .../lang/eval-okay-fromjson.exp | 0 .../lang/eval-okay-fromjson.nix | 0 .../lang/eval-okay-functionargs.exp | 0 .../lang/eval-okay-functionargs.exp.xml | 0 .../lang/eval-okay-functionargs.nix | 0 .../eval-okay-getattrpos-functionargs.exp | 0 .../eval-okay-getattrpos-functionargs.nix | 0 .../lang/eval-okay-getattrpos-undefined.exp | 0 .../lang/eval-okay-getattrpos-undefined.nix | 0 .../lang/eval-okay-getattrpos.exp | 0 .../lang/eval-okay-getattrpos.nix | 0 .../lang/eval-okay-getenv.exp | 0 .../lang/eval-okay-getenv.nix | 0 .../lang/eval-okay-groupBy.exp | 0 .../lang/eval-okay-groupBy.nix | 0 .../lang/eval-okay-hash.exp | 0 .../lang/eval-okay-hashfile.exp | 0 .../lang/eval-okay-hashfile.nix | 0 .../lang/eval-okay-hashstring.exp | 0 .../lang/eval-okay-hashstring.nix | 0 .../lang/eval-okay-if.exp | 0 .../lang/eval-okay-if.nix | 0 .../lang/eval-okay-import.exp | 0 .../lang/eval-okay-import.nix | 0 .../lang/eval-okay-ind-string.exp | 0 .../lang/eval-okay-ind-string.nix | 0 .../lang/eval-okay-inherit-attr-pos.exp | 0 .../lang/eval-okay-inherit-attr-pos.nix | 0 .../lang/eval-okay-inherit-from.err.exp | 0 .../lang/eval-okay-inherit-from.exp | 0 .../lang/eval-okay-inherit-from.nix | 0 .../lang/eval-okay-intersectAttrs.exp | 0 .../lang/eval-okay-intersectAttrs.nix | 0 .../lang/eval-okay-let.exp | 0 .../lang/eval-okay-let.nix | 0 .../lang/eval-okay-list.exp | 0 .../lang/eval-okay-list.nix | 0 .../lang/eval-okay-listtoattrs.exp | 0 .../lang/eval-okay-listtoattrs.nix | 0 .../lang/eval-okay-logic.exp | 0 .../lang/eval-okay-logic.nix | 0 .../lang/eval-okay-map.exp | 0 .../lang/eval-okay-map.nix | 0 .../lang/eval-okay-mapattrs.exp | 0 .../lang/eval-okay-mapattrs.nix | 0 .../lang/eval-okay-merge-dynamic-attrs.exp | 0 .../lang/eval-okay-merge-dynamic-attrs.nix | 0 .../lang/eval-okay-nested-with.exp | 0 .../lang/eval-okay-nested-with.nix | 0 .../lang/eval-okay-new-let.exp | 0 .../lang/eval-okay-new-let.nix | 0 .../lang/eval-okay-null-dynamic-attrs.exp | 0 .../lang/eval-okay-null-dynamic-attrs.nix | 0 .../lang/eval-okay-overrides.exp | 0 .../lang/eval-okay-overrides.nix | 0 .../lang/eval-okay-parse-flake-ref.exp | 0 .../lang/eval-okay-parse-flake-ref.nix | 0 .../lang/eval-okay-partition.exp | 0 .../lang/eval-okay-partition.nix | 0 .../eval-okay-path-string-interpolation.exp | 0 .../eval-okay-path-string-interpolation.nix | 0 .../lang/eval-okay-path.exp | 0 .../lang/eval-okay-path.nix | 0 .../lang/eval-okay-pathexists.exp | 0 .../lang/eval-okay-pathexists.nix | 0 .../lang/eval-okay-patterns.exp | 0 .../lang/eval-okay-patterns.nix | 0 .../lang/eval-okay-print.err.exp | 0 .../lang/eval-okay-print.exp | 0 .../lang/eval-okay-print.nix | 0 .../lang/eval-okay-readDir.exp | 0 .../lang/eval-okay-readDir.nix | 0 .../lang/eval-okay-readFileType.exp | 0 .../lang/eval-okay-readFileType.nix | 0 .../lang/eval-okay-readfile.exp | 0 .../lang/eval-okay-readfile.nix | 0 .../lang/eval-okay-redefine-builtin.exp | 0 .../lang/eval-okay-redefine-builtin.nix | 0 .../lang/eval-okay-regex-match.exp | 0 .../lang/eval-okay-regex-match.nix | 0 .../lang/eval-okay-regex-split.exp | 0 .../lang/eval-okay-regex-split.nix | 0 .../lang/eval-okay-regression-20220122.exp | 0 .../lang/eval-okay-regression-20220122.nix | 0 .../lang/eval-okay-regression-20220125.exp | 0 .../lang/eval-okay-regression-20220125.nix | 0 .../lang/eval-okay-remove.exp | 0 .../lang/eval-okay-remove.nix | 0 .../lang/eval-okay-repeated-empty-attrs.exp | 0 .../lang/eval-okay-repeated-empty-attrs.nix | 0 .../lang/eval-okay-repeated-empty-list.exp | 0 .../lang/eval-okay-repeated-empty-list.nix | 0 .../lang/eval-okay-replacestrings.exp | 0 .../lang/eval-okay-replacestrings.nix | 0 .../lang/eval-okay-scope-1.exp | 0 .../lang/eval-okay-scope-1.nix | 0 .../lang/eval-okay-scope-2.exp | 0 .../lang/eval-okay-scope-2.nix | 0 .../lang/eval-okay-scope-3.exp | 0 .../lang/eval-okay-scope-3.nix | 0 .../lang/eval-okay-scope-4.exp | 0 .../lang/eval-okay-scope-4.nix | 0 .../lang/eval-okay-scope-6.exp | 0 .../lang/eval-okay-scope-6.nix | 0 .../lang/eval-okay-scope-7.exp | 0 .../lang/eval-okay-scope-7.nix | 0 .../lang/eval-okay-search-path.exp | 0 .../lang/eval-okay-search-path.flags | 0 .../lang/eval-okay-search-path.nix | 0 .../lang/eval-okay-seq.exp | 0 .../lang/eval-okay-seq.nix | 0 .../lang/eval-okay-sort.exp | 0 .../lang/eval-okay-sort.nix | 0 .../lang/eval-okay-splitversion.exp | 0 .../lang/eval-okay-splitversion.nix | 0 .../lang/eval-okay-string.exp | 0 .../lang/eval-okay-string.nix | 0 .../lang/eval-okay-strings-as-attrs-names.exp | 0 .../lang/eval-okay-strings-as-attrs-names.nix | 0 .../lang/eval-okay-substring-context.exp | 0 .../lang/eval-okay-substring-context.nix | 0 .../lang/eval-okay-substring.exp | 0 .../lang/eval-okay-substring.nix | 0 .../lang/eval-okay-symlink-resolution.exp | 0 .../lang/eval-okay-symlink-resolution.nix | 0 .../lang/eval-okay-tail-call-1.exp-disabled | 0 .../lang/eval-okay-tail-call-1.nix | 0 .../lang/eval-okay-tojson.exp | 0 .../lang/eval-okay-tojson.nix | 0 .../lang/eval-okay-toxml.exp | 0 .../lang/eval-okay-toxml.nix | 0 .../lang/eval-okay-toxml2.exp | 0 .../lang/eval-okay-toxml2.nix | 0 .../lang/eval-okay-tryeval.exp | 0 .../lang/eval-okay-tryeval.nix | 0 .../lang/eval-okay-types.exp | 0 .../lang/eval-okay-types.nix | 0 .../lang/eval-okay-versions.exp | 0 .../lang/eval-okay-versions.nix | 0 .../lang/eval-okay-with.exp | 0 .../lang/eval-okay-with.nix | 0 .../lang/eval-okay-xml.exp.xml | 0 .../lang/eval-okay-xml.nix | 0 .../lang/eval-okay-zipAttrsWith.exp | 0 .../lang/eval-okay-zipAttrsWith.nix | 0 .../nix-functional-tests}/lang/imported.nix | 0 .../nix-functional-tests}/lang/imported2.nix | 0 .../nix-functional-tests}/lang/lib.nix | 0 .../lang/non-eval-fail-bad-drvPath.nix | 0 .../lang/parse-fail-dup-attrs-1.err.exp | 0 .../lang/parse-fail-dup-attrs-1.nix | 0 .../lang/parse-fail-dup-attrs-2.err.exp | 0 .../lang/parse-fail-dup-attrs-2.nix | 0 .../lang/parse-fail-dup-attrs-3.err.exp | 0 .../lang/parse-fail-dup-attrs-3.nix | 0 .../lang/parse-fail-dup-attrs-4.err.exp | 0 .../lang/parse-fail-dup-attrs-4.nix | 0 .../lang/parse-fail-dup-attrs-7.err.exp | 0 .../lang/parse-fail-dup-attrs-7.nix | 0 .../lang/parse-fail-dup-formals.err.exp | 0 .../lang/parse-fail-dup-formals.nix | 0 .../lang/parse-fail-eof-in-string.err.exp | 0 .../lang/parse-fail-eof-in-string.nix | 0 .../lang/parse-fail-eof-pos.err.exp | 0 .../lang/parse-fail-eof-pos.nix | 0 .../parse-fail-mixed-nested-attrs1.err.exp | 0 .../lang/parse-fail-mixed-nested-attrs1.nix | 0 .../parse-fail-mixed-nested-attrs2.err.exp | 0 .../lang/parse-fail-mixed-nested-attrs2.nix | 0 .../lang/parse-fail-patterns-1.err.exp | 0 .../lang/parse-fail-patterns-1.nix | 0 .../parse-fail-regression-20060610.err.exp | 0 .../lang/parse-fail-regression-20060610.nix | 0 .../lang/parse-fail-undef-var-2.err.exp | 0 .../lang/parse-fail-undef-var-2.nix | 0 .../lang/parse-fail-undef-var.err.exp | 0 .../lang/parse-fail-undef-var.nix | 0 .../lang/parse-fail-utf8.err.exp | 0 .../lang/parse-fail-utf8.nix | 0 .../lang/parse-okay-1.exp | 0 .../lang/parse-okay-1.nix | 0 .../lang/parse-okay-crlf.exp | 0 .../lang/parse-okay-crlf.nix | 0 .../lang/parse-okay-dup-attrs-5.exp | 0 .../lang/parse-okay-dup-attrs-5.nix | 0 .../lang/parse-okay-dup-attrs-6.exp | 0 .../lang/parse-okay-dup-attrs-6.nix | 0 .../lang/parse-okay-ind-string.exp | 0 .../lang/parse-okay-ind-string.nix | 0 .../lang/parse-okay-inherits.exp | 0 .../lang/parse-okay-inherits.nix | 0 .../lang/parse-okay-mixed-nested-attrs-1.exp | 0 .../lang/parse-okay-mixed-nested-attrs-1.nix | 0 .../lang/parse-okay-mixed-nested-attrs-2.exp | 0 .../lang/parse-okay-mixed-nested-attrs-2.nix | 0 .../lang/parse-okay-mixed-nested-attrs-3.exp | 0 .../lang/parse-okay-mixed-nested-attrs-3.nix | 0 .../lang/parse-okay-regression-20041027.exp | 0 .../lang/parse-okay-regression-20041027.nix | 0 .../lang/parse-okay-regression-751.exp | 0 .../lang/parse-okay-regression-751.nix | 0 .../lang/parse-okay-subversion.exp | 0 .../lang/parse-okay-subversion.nix | 0 .../lang/parse-okay-url.exp | 0 .../lang/parse-okay-url.nix | 0 .../nix-functional-tests}/lang/readDir/bar | 0 .../lang/readDir/foo/git-hates-directories | 0 .../nix-functional-tests}/lang/readDir/ldir | 0 .../nix-functional-tests}/lang/readDir/linked | 0 .../lang/symlink-resolution/broken | 0 .../symlink-resolution/foo/lib/default.nix | 0 .../lang/symlink-resolution/foo/overlays | 0 .../symlink-resolution/overlays/overlay.nix | 0 .../nix-functional-tests}/legacy-ssh-store.sh | 0 .../linux-sandbox-cert-test.nix | 0 .../nix-functional-tests}/linux-sandbox.sh | 0 .../local-overlay-store/add-lower-inner.sh | 0 .../local-overlay-store/add-lower.sh | 0 .../local-overlay-store/bad-uris.sh | 0 .../local-overlay-store/build-inner.sh | 0 .../local-overlay-store/build.sh | 0 .../check-post-init-inner.sh | 0 .../local-overlay-store/check-post-init.sh | 0 .../local-overlay-store/common.sh | 0 .../delete-duplicate-inner.sh | 0 .../local-overlay-store/delete-duplicate.sh | 0 .../local-overlay-store/delete-refs-inner.sh | 0 .../local-overlay-store/delete-refs.sh | 0 .../local-overlay-store/gc-inner.sh | 0 .../local-overlay-store/gc.sh | 0 .../local-overlay-store/local.mk | 0 .../local-overlay-store/meson.build | 0 .../local-overlay-store/optimise-inner.sh | 0 .../local-overlay-store/optimise.sh | 0 .../redundant-add-inner.sh | 0 .../local-overlay-store/redundant-add.sh | 0 .../local-overlay-store/remount.sh | 0 .../stale-file-handle-inner.sh | 0 .../local-overlay-store/stale-file-handle.sh | 0 .../local-overlay-store/verify-inner.sh | 0 .../local-overlay-store/verify.sh | 0 .../nix-functional-tests}/local.mk | 0 .../nix-functional-tests}/logging.sh | 0 .../nix-functional-tests}/meson.build | 2 +- .../nix-functional-tests}/misc.sh | 0 .../multiple-outputs.nix | 0 .../nix-functional-tests}/multiple-outputs.sh | 0 .../nix-functional-tests}/name-after-node.nar | Bin .../nix-functional-tests}/nar-access.nix | 0 .../nix-functional-tests}/nar-access.sh | 0 .../nix-functional-tests}/nars.sh | 0 .../nested-sandboxing.sh | 2 +- .../nested-sandboxing/command.sh | 0 .../nested-sandboxing/runner.nix | 0 .../nix-build-examples.nix | 0 .../nix-functional-tests}/nix-build.sh | 0 .../nix-functional-tests}/nix-channel.sh | 0 .../nix-collect-garbage-d.sh | 0 .../nix-copy-ssh-common.sh | 0 .../nix-functional-tests}/nix-copy-ssh-ng.sh | 0 .../nix-functional-tests}/nix-copy-ssh.sh | 0 .../nix-daemon-untrusting.sh | 0 .../nix-functional-tests}/nix-profile.sh | 0 .../nix-functional-tests}/nix-shell.sh | 0 .../nix-functional-tests}/nix_path.sh | 0 .../nix-functional-tests}/nul.nar | Bin .../nix-functional-tests}/optimise-store.sh | 0 .../output-normalization.sh | 0 .../nix-functional-tests}/package.nix | 3 +- .../nix-functional-tests}/parallel.builder.sh | 0 .../nix-functional-tests}/parallel.nix | 0 .../nix-functional-tests}/parallel.sh | 0 .../nix-functional-tests}/pass-as-file.sh | 0 .../path-from-hash-part.sh | 0 .../nix-functional-tests}/path-info.sh | 0 .../nix-functional-tests}/path.nix | 0 .../nix-functional-tests}/placeholders.sh | 0 .../nix-functional-tests}/plugins.sh | 0 .../nix-functional-tests}/plugins/local.mk | 0 .../nix-functional-tests}/plugins/meson.build | 0 .../plugins/plugintest.cc | 0 .../nix-functional-tests}/post-hook.sh | 0 .../nix-functional-tests}/pure-eval.nix | 0 .../nix-functional-tests}/pure-eval.sh | 0 .../push-to-store-old.sh | 0 .../nix-functional-tests}/push-to-store.sh | 0 .../nix-functional-tests}/read-only-store.sh | 0 .../readfile-context.nix | 0 .../nix-functional-tests}/readfile-context.sh | 0 .../nix-functional-tests}/recursive.nix | 0 .../nix-functional-tests}/recursive.sh | 0 .../nix-functional-tests}/referrers.sh | 0 .../nix-functional-tests}/remote-store.sh | 0 .../nix-functional-tests}/repair.sh | 0 .../nix-functional-tests}/repl.sh | 4 +- .../repl/characterisation/empty | 0 .../repl/doc-comment-curried-args.expected | 4 +- .../repl/doc-comment-curried-args.in | 0 .../repl/doc-comment-formals.expected | 2 +- .../repl/doc-comment-formals.in | 0 .../repl/doc-comment-function.expected | 2 +- .../repl/doc-comment-function.in | 0 .../repl/doc-comment-function.nix | 0 .../repl/doc-comments.nix | 0 .../repl/doc-compact.expected | 2 +- .../nix-functional-tests}/repl/doc-compact.in | 0 .../repl/doc-constant.expected | 16 +- .../repl/doc-constant.in | 0 .../repl/doc-floatedIn.expected | 2 +- .../repl/doc-floatedIn.in | 0 .../repl/doc-functor.expected | 24 +- .../nix-functional-tests}/repl/doc-functor.in | 0 .../repl/doc-functor.nix | 0 .../repl/doc-lambda-flavors.expected | 8 +- .../repl/doc-lambda-flavors.in | 0 .../repl/doc-measurement.expected | 2 +- .../repl/doc-measurement.in | 0 .../repl/doc-multiply.expected | 2 +- .../repl/doc-multiply.in | 0 .../repl/doc-unambiguous.expected | 2 +- .../repl/doc-unambiguous.in | 0 .../repl/pretty-print-idempotent.expected | 0 .../repl/pretty-print-idempotent.in | 0 .../repl/pretty-print-idempotent.nix | 0 .../nix-functional-tests}/restricted.nix | 0 .../nix-functional-tests}/restricted.sh | 0 .../nix-functional-tests}/search.nix | 0 .../nix-functional-tests}/search.sh | 0 .../secure-drv-outputs.nix | 0 .../secure-drv-outputs.sh | 0 .../nix-functional-tests}/selfref-gc.sh | 0 .../nix-functional-tests}/shell-hello.nix | 0 .../nix-functional-tests}/shell.nix | 0 .../nix-functional-tests}/shell.sh | 0 .../nix-functional-tests}/shell.shebang.expr | 0 .../shell.shebang.legacy.expr | 0 .../nix-functional-tests}/shell.shebang.nix | 0 .../nix-functional-tests}/shell.shebang.rb | 0 .../nix-functional-tests}/shell.shebang.sh | 0 .../nix-functional-tests}/signing.sh | 0 .../nix-functional-tests}/simple-failing.nix | 0 .../nix-functional-tests}/simple.builder.sh | 0 .../nix-functional-tests}/simple.nix | 0 .../nix-functional-tests}/simple.sh | 0 .../nix-functional-tests}/slash.nar | Bin .../nix-functional-tests}/ssh-relay.sh | 0 .../nix-functional-tests}/store-info.sh | 0 .../structured-attrs-shell.nix | 0 .../structured-attrs.nix | 0 .../nix-functional-tests}/structured-attrs.sh | 0 .../substitute-with-invalid-ca.sh | 0 .../nix-functional-tests}/suggestions.sh | 0 .../supplementary-groups.sh | 0 .../symlink-derivation.nix | 0 .../nix-functional-tests}/tarball.sh | 0 .../nix-functional-tests}/test-infra.sh | 0 .../test-libstoreconsumer.sh | 0 .../test-libstoreconsumer/README.md | 0 .../test-libstoreconsumer/local.mk | 0 .../test-libstoreconsumer/main.cc | 0 .../test-libstoreconsumer/meson.build | 0 .../nix-functional-tests}/timeout.nix | 0 .../nix-functional-tests}/timeout.sh | 0 .../nix-functional-tests}/toString-path.sh | 0 .../nix-functional-tests}/tree.tar.gz | Bin .../undefined-variable.nix | 0 .../nix-functional-tests}/unnormalized.nar | Bin .../user-envs-migration.sh | 0 .../user-envs-test-case.sh | 0 .../user-envs.builder.sh | 0 .../nix-functional-tests}/user-envs.nix | 0 .../nix-functional-tests}/user-envs.sh | 0 .../nix-functional-tests}/why-depends.sh | 0 .../nix-functional-tests}/zstd.sh | 0 src/nix-store-tests/package.nix | 2 +- tests/nixos/functional/common.nix | 4 +- tests/repl-completion.nix | 2 +- 843 files changed, 236 insertions(+), 238 deletions(-) delete mode 120000 src/nix-functional-tests rename {tests/functional => src/nix-functional-tests}/.version (100%) rename {tests/functional => src/nix-functional-tests}/add.sh (100%) rename {tests/functional => src/nix-functional-tests}/bash-profile.sh (100%) rename {tests/functional => src/nix-functional-tests}/big-derivation-attr.nix (100%) rename {tests/functional => src/nix-functional-tests}/binary-cache-build-remote.sh (100%) rename {tests/functional => src/nix-functional-tests}/binary-cache.sh (100%) rename {tests/functional => src/nix-functional-tests}/brotli.sh (100%) rename {tests/functional => src/nix-functional-tests}/build-delete.sh (100%) rename {tests/functional => src/nix-functional-tests}/build-dry.sh (100%) rename {tests/functional => src/nix-functional-tests}/build-hook-ca-fixed.nix (100%) rename {tests/functional => src/nix-functional-tests}/build-hook-ca-floating.nix (100%) rename {tests/functional => src/nix-functional-tests}/build-hook.nix (100%) rename {tests/functional => src/nix-functional-tests}/build-remote-content-addressed-fixed.sh (100%) rename {tests/functional => src/nix-functional-tests}/build-remote-content-addressed-floating.sh (100%) rename {tests/functional => src/nix-functional-tests}/build-remote-input-addressed.sh (100%) rename {tests/functional => src/nix-functional-tests}/build-remote-trustless-after.sh (100%) rename {tests/functional => src/nix-functional-tests}/build-remote-trustless-should-fail-0.sh (100%) rename {tests/functional => src/nix-functional-tests}/build-remote-trustless-should-pass-0.sh (100%) rename {tests/functional => src/nix-functional-tests}/build-remote-trustless-should-pass-1.sh (100%) rename {tests/functional => src/nix-functional-tests}/build-remote-trustless-should-pass-2.sh (100%) rename {tests/functional => src/nix-functional-tests}/build-remote-trustless-should-pass-3.sh (100%) rename {tests/functional => src/nix-functional-tests}/build-remote-trustless.sh (86%) rename {tests/functional => src/nix-functional-tests}/build-remote-with-mounted-ssh-ng.sh (100%) rename {tests/functional => src/nix-functional-tests}/build-remote.sh (100%) rename {tests/functional => src/nix-functional-tests}/build.sh (100%) rename {tests/functional => src/nix-functional-tests}/ca-shell.nix (100%) rename {tests/functional => src/nix-functional-tests}/ca/build-cache.sh (100%) rename {tests/functional => src/nix-functional-tests}/ca/build-dry.sh (100%) rename {tests/functional => src/nix-functional-tests}/ca/build-with-garbage-path.sh (100%) rename {tests/functional => src/nix-functional-tests}/ca/build.sh (100%) rename {tests/functional => src/nix-functional-tests}/ca/common.sh (100%) rename {tests/functional => src/nix-functional-tests}/ca/concurrent-builds.sh (100%) rename {tests/functional => src/nix-functional-tests}/ca/config.nix.in (100%) rename {tests/functional => src/nix-functional-tests}/ca/content-addressed.nix (100%) rename {tests/functional => src/nix-functional-tests}/ca/derivation-json.sh (100%) rename {tests/functional => src/nix-functional-tests}/ca/duplicate-realisation-in-closure.sh (100%) rename {tests/functional => src/nix-functional-tests}/ca/eval-store.sh (100%) rename {tests/functional => src/nix-functional-tests}/ca/flake.nix (100%) rename {tests/functional => src/nix-functional-tests}/ca/gc.sh (100%) rename {tests/functional => src/nix-functional-tests}/ca/import-from-derivation.sh (100%) rename {tests/functional => src/nix-functional-tests}/ca/local.mk (93%) rename {tests/functional => src/nix-functional-tests}/ca/meson.build (100%) rename {tests/functional => src/nix-functional-tests}/ca/new-build-cmd.sh (100%) rename {tests/functional => src/nix-functional-tests}/ca/nix-copy.sh (100%) rename {tests/functional => src/nix-functional-tests}/ca/nix-run.sh (100%) rename {tests/functional => src/nix-functional-tests}/ca/nix-shell.sh (100%) rename {tests/functional => src/nix-functional-tests}/ca/nondeterministic.nix (100%) rename {tests/functional => src/nix-functional-tests}/ca/post-hook.sh (100%) rename {tests/functional => src/nix-functional-tests}/ca/racy.nix (100%) rename {tests/functional => src/nix-functional-tests}/ca/recursive.sh (100%) rename {tests/functional => src/nix-functional-tests}/ca/repl.sh (100%) rename {tests/functional => src/nix-functional-tests}/ca/selfref-gc.sh (100%) rename {tests/functional => src/nix-functional-tests}/ca/signatures.sh (100%) rename {tests/functional => src/nix-functional-tests}/ca/substitute.sh (100%) rename {tests/functional => src/nix-functional-tests}/ca/why-depends.sh (100%) rename {tests/functional => src/nix-functional-tests}/case-collision.nar (100%) rename {tests/functional => src/nix-functional-tests}/case.nar (100%) rename {tests/functional => src/nix-functional-tests}/characterisation-test-infra.sh (100%) rename {tests/functional => src/nix-functional-tests}/characterisation/empty (100%) rename {tests/functional => src/nix-functional-tests}/characterisation/framework.sh (96%) rename {tests/functional => src/nix-functional-tests}/check-refs.nix (100%) rename {tests/functional => src/nix-functional-tests}/check-refs.sh (100%) rename {tests/functional => src/nix-functional-tests}/check-reqs.nix (100%) rename {tests/functional => src/nix-functional-tests}/check-reqs.sh (100%) rename {tests/functional => src/nix-functional-tests}/check.nix (100%) rename {tests/functional => src/nix-functional-tests}/check.sh (100%) rename {tests/functional => src/nix-functional-tests}/chroot-store.sh (100%) rename {tests/functional => src/nix-functional-tests}/common.sh (100%) rename {tests/functional => src/nix-functional-tests}/common/functions.sh (100%) rename {tests/functional => src/nix-functional-tests}/common/init.sh (100%) rename {tests/functional => src/nix-functional-tests}/common/meson.build (100%) rename {tests/functional => src/nix-functional-tests}/common/paths.sh (100%) rename {tests/functional => src/nix-functional-tests}/common/subst-vars.sh.in (100%) rename {tests/functional => src/nix-functional-tests}/common/test-root.sh (100%) rename {tests/functional => src/nix-functional-tests}/common/vars.sh (100%) rename {tests/functional => src/nix-functional-tests}/completions.sh (100%) rename {tests/functional => src/nix-functional-tests}/compression-levels.sh (100%) rename {tests/functional => src/nix-functional-tests}/compute-levels.sh (100%) rename {tests/functional => src/nix-functional-tests}/config.nix.in (100%) rename {tests/functional => src/nix-functional-tests}/config.sh (100%) rename {tests/functional => src/nix-functional-tests}/config/extra-config.conf (100%) rename {tests/functional => src/nix-functional-tests}/config/nix-with-bang-include.conf (100%) rename {tests/functional => src/nix-functional-tests}/config/nix-with-include.conf (100%) rename {tests/functional => src/nix-functional-tests}/config/nix-with-substituters.conf (100%) rename {tests/functional => src/nix-functional-tests}/db-migration.sh (100%) rename {tests/functional => src/nix-functional-tests}/debugger.sh (100%) rename {tests/functional => src/nix-functional-tests}/dependencies.builder0.sh (100%) rename {tests/functional => src/nix-functional-tests}/dependencies.nix (100%) rename {tests/functional => src/nix-functional-tests}/dependencies.sh (100%) rename {tests/functional => src/nix-functional-tests}/derivation-advanced-attributes.sh (100%) rename {tests/functional => src/nix-functional-tests}/derivation-json.sh (100%) rename {tests/functional => src/nix-functional-tests}/derivation/advanced-attributes-defaults.drv (100%) rename {tests/functional => src/nix-functional-tests}/derivation/advanced-attributes-defaults.nix (100%) rename {tests/functional => src/nix-functional-tests}/derivation/advanced-attributes-structured-attrs-defaults.drv (100%) rename {tests/functional => src/nix-functional-tests}/derivation/advanced-attributes-structured-attrs-defaults.nix (100%) rename {tests/functional => src/nix-functional-tests}/derivation/advanced-attributes-structured-attrs.drv (100%) rename {tests/functional => src/nix-functional-tests}/derivation/advanced-attributes-structured-attrs.nix (100%) rename {tests/functional => src/nix-functional-tests}/derivation/advanced-attributes.drv (100%) rename {tests/functional => src/nix-functional-tests}/derivation/advanced-attributes.nix (100%) rename {tests/functional => src/nix-functional-tests}/dot.nar (100%) rename {tests/functional => src/nix-functional-tests}/dotdot.nar (100%) rename {tests/functional => src/nix-functional-tests}/dummy (100%) rename {tests/functional => src/nix-functional-tests}/dump-db.sh (100%) rename {tests/functional => src/nix-functional-tests}/duplicate.nar (100%) rename {tests/functional => src/nix-functional-tests}/dyn-drv/build-built-drv.sh (100%) rename {tests/functional => src/nix-functional-tests}/dyn-drv/common.sh (100%) rename {tests/functional => src/nix-functional-tests}/dyn-drv/config.nix.in (100%) rename {tests/functional => src/nix-functional-tests}/dyn-drv/dep-built-drv.sh (100%) rename {tests/functional => src/nix-functional-tests}/dyn-drv/eval-outputOf.sh (100%) rename {tests/functional => src/nix-functional-tests}/dyn-drv/local.mk (85%) rename {tests/functional => src/nix-functional-tests}/dyn-drv/meson.build (100%) rename {tests/functional => src/nix-functional-tests}/dyn-drv/old-daemon-error-hack.nix (100%) rename {tests/functional => src/nix-functional-tests}/dyn-drv/old-daemon-error-hack.sh (100%) rename {tests/functional => src/nix-functional-tests}/dyn-drv/recursive-mod-json.nix (100%) rename {tests/functional => src/nix-functional-tests}/dyn-drv/recursive-mod-json.sh (100%) rename {tests/functional => src/nix-functional-tests}/dyn-drv/text-hashed-output.nix (100%) rename {tests/functional => src/nix-functional-tests}/dyn-drv/text-hashed-output.sh (100%) rename {tests/functional => src/nix-functional-tests}/empty.nar (100%) rename {tests/functional => src/nix-functional-tests}/eval-store.sh (100%) rename {tests/functional => src/nix-functional-tests}/eval.nix (100%) rename {tests/functional => src/nix-functional-tests}/eval.sh (100%) rename {tests/functional => src/nix-functional-tests}/executable-after-contents.nar (100%) rename {tests/functional => src/nix-functional-tests}/experimental-features.sh (100%) rename {tests/functional => src/nix-functional-tests}/export-graph.nix (100%) rename {tests/functional => src/nix-functional-tests}/export-graph.sh (100%) rename {tests/functional => src/nix-functional-tests}/export.sh (100%) rename {tests/functional => src/nix-functional-tests}/extra-sandbox-profile.nix (100%) rename {tests/functional => src/nix-functional-tests}/extra-sandbox-profile.sh (100%) rename {tests/functional => src/nix-functional-tests}/failing.nix (100%) rename {tests/functional => src/nix-functional-tests}/fetchClosure.sh (100%) rename {tests/functional => src/nix-functional-tests}/fetchGit.sh (100%) rename {tests/functional => src/nix-functional-tests}/fetchGitRefs.sh (100%) rename {tests/functional => src/nix-functional-tests}/fetchGitSubmodules.sh (100%) rename {tests/functional => src/nix-functional-tests}/fetchGitVerification.sh (100%) rename {tests/functional => src/nix-functional-tests}/fetchMercurial.sh (100%) rename {tests/functional => src/nix-functional-tests}/fetchPath.sh (100%) rename {tests/functional => src/nix-functional-tests}/fetchTree-file.sh (100%) rename {tests/functional => src/nix-functional-tests}/fetchurl.sh (100%) rename {tests/functional => src/nix-functional-tests}/filter-source.nix (100%) rename {tests/functional => src/nix-functional-tests}/filter-source.sh (100%) rename {tests/functional => src/nix-functional-tests}/fixed.builder1.sh (100%) rename {tests/functional => src/nix-functional-tests}/fixed.builder2.sh (100%) rename {tests/functional => src/nix-functional-tests}/fixed.nix (100%) rename {tests/functional => src/nix-functional-tests}/fixed.sh (100%) rename {tests/functional => src/nix-functional-tests}/flakes/absolute-attr-paths.sh (100%) rename {tests/functional => src/nix-functional-tests}/flakes/absolute-paths.sh (100%) rename {tests/functional => src/nix-functional-tests}/flakes/build-paths.sh (100%) rename {tests/functional => src/nix-functional-tests}/flakes/bundle.sh (100%) rename {tests/functional => src/nix-functional-tests}/flakes/check.sh (100%) rename {tests/functional => src/nix-functional-tests}/flakes/circular.sh (100%) rename {tests/functional => src/nix-functional-tests}/flakes/common.sh (100%) rename {tests/functional => src/nix-functional-tests}/flakes/config.sh (100%) rename {tests/functional => src/nix-functional-tests}/flakes/develop.sh (100%) rename {tests/functional => src/nix-functional-tests}/flakes/dubious-query.sh (100%) rename {tests/functional => src/nix-functional-tests}/flakes/edit.sh (100%) rename {tests/functional => src/nix-functional-tests}/flakes/eval-cache.sh (100%) rename {tests/functional => src/nix-functional-tests}/flakes/flake-in-submodule.sh (100%) rename {tests/functional => src/nix-functional-tests}/flakes/flakes.sh (100%) rename {tests/functional => src/nix-functional-tests}/flakes/follow-paths.sh (100%) rename {tests/functional => src/nix-functional-tests}/flakes/init.sh (100%) rename {tests/functional => src/nix-functional-tests}/flakes/inputs.sh (100%) rename {tests/functional => src/nix-functional-tests}/flakes/local.mk (100%) rename {tests/functional => src/nix-functional-tests}/flakes/mercurial.sh (100%) rename {tests/functional => src/nix-functional-tests}/flakes/meson.build (100%) rename {tests/functional => src/nix-functional-tests}/flakes/prefetch.sh (100%) rename {tests/functional => src/nix-functional-tests}/flakes/run.sh (100%) rename {tests/functional => src/nix-functional-tests}/flakes/search-root.sh (100%) rename {tests/functional => src/nix-functional-tests}/flakes/show.sh (100%) rename {tests/functional => src/nix-functional-tests}/flakes/tree.zip (100%) rename {tests/functional => src/nix-functional-tests}/flakes/unlocked-override.sh (100%) rename {tests/functional => src/nix-functional-tests}/fmt.sh (100%) rename {tests/functional => src/nix-functional-tests}/fmt.simple.sh (100%) rename {tests/functional => src/nix-functional-tests}/fod-failing.nix (100%) rename {tests/functional => src/nix-functional-tests}/function-trace.sh (100%) rename {tests/functional => src/nix-functional-tests}/gc-auto.sh (100%) rename {tests/functional => src/nix-functional-tests}/gc-concurrent.builder.sh (100%) rename {tests/functional => src/nix-functional-tests}/gc-concurrent.nix (100%) rename {tests/functional => src/nix-functional-tests}/gc-concurrent.sh (100%) rename {tests/functional => src/nix-functional-tests}/gc-concurrent2.builder.sh (100%) rename {tests/functional => src/nix-functional-tests}/gc-non-blocking.sh (100%) rename {tests/functional => src/nix-functional-tests}/gc-runtime.nix (100%) rename {tests/functional => src/nix-functional-tests}/gc-runtime.sh (100%) rename {tests/functional => src/nix-functional-tests}/gc.sh (100%) rename {tests/functional => src/nix-functional-tests}/git-hashing/common.sh (100%) rename {tests/functional => src/nix-functional-tests}/git-hashing/local.mk (100%) rename {tests/functional => src/nix-functional-tests}/git-hashing/meson.build (100%) rename {tests/functional => src/nix-functional-tests}/git-hashing/simple.sh (100%) rename {tests/functional => src/nix-functional-tests}/hash-check.nix (100%) rename {tests/functional => src/nix-functional-tests}/hash-convert.sh (100%) rename {tests/functional => src/nix-functional-tests}/hash-path.sh (100%) rename {tests/functional => src/nix-functional-tests}/help.sh (100%) rename {tests/functional => src/nix-functional-tests}/hermetic.nix (100%) rename {tests/functional => src/nix-functional-tests}/ifd.nix (100%) rename {tests/functional => src/nix-functional-tests}/import-from-derivation.nix (100%) rename {tests/functional => src/nix-functional-tests}/import-from-derivation.sh (100%) rename {tests/functional => src/nix-functional-tests}/impure-derivations.nix (100%) rename {tests/functional => src/nix-functional-tests}/impure-derivations.sh (100%) rename {tests/functional => src/nix-functional-tests}/impure-env.nix (100%) rename {tests/functional => src/nix-functional-tests}/impure-env.sh (100%) rename {tests/functional => src/nix-functional-tests}/impure-eval.sh (100%) rename {tests/functional => src/nix-functional-tests}/install-darwin.sh (100%) rename {tests/functional => src/nix-functional-tests}/lang-gc.sh (100%) rename {tests/functional => src/nix-functional-tests}/lang-gc/issue-11141-gc-coroutine-test.nix (100%) rename {tests/functional => src/nix-functional-tests}/lang.sh (100%) rename {tests/functional => src/nix-functional-tests}/lang/binary-data (100%) rename {tests/functional => src/nix-functional-tests}/lang/data (100%) rename {tests/functional => src/nix-functional-tests}/lang/dir1/a.nix (100%) rename {tests/functional => src/nix-functional-tests}/lang/dir2/a.nix (100%) rename {tests/functional => src/nix-functional-tests}/lang/dir2/b.nix (100%) rename {tests/functional => src/nix-functional-tests}/lang/dir3/a.nix (100%) rename {tests/functional => src/nix-functional-tests}/lang/dir3/b.nix (100%) rename {tests/functional => src/nix-functional-tests}/lang/dir3/c.nix (100%) rename {tests/functional => src/nix-functional-tests}/lang/dir4/a.nix (100%) rename {tests/functional => src/nix-functional-tests}/lang/dir4/c.nix (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-fail-abort.err.exp (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-fail-abort.nix (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-fail-addDrvOutputDependencies-empty-context.err.exp (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-fail-addDrvOutputDependencies-empty-context.nix (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-fail-addDrvOutputDependencies-multi-elem-context.err.exp (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-fail-addDrvOutputDependencies-multi-elem-context.nix (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-fail-addDrvOutputDependencies-wrong-element-kind.err.exp (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-fail-addDrvOutputDependencies-wrong-element-kind.nix (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-fail-addErrorContext-example.err.exp (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-fail-addErrorContext-example.flags (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-fail-addErrorContext-example.nix (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-fail-assert-equal-attrs-names-2.err.exp (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-fail-assert-equal-attrs-names-2.nix (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-fail-assert-equal-attrs-names.err.exp (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-fail-assert-equal-attrs-names.nix (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-fail-assert-equal-derivations-extra.err.exp (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-fail-assert-equal-derivations-extra.nix (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-fail-assert-equal-derivations.err.exp (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-fail-assert-equal-derivations.nix (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-fail-assert-equal-floats.err.exp (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-fail-assert-equal-floats.nix (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-fail-assert-equal-function-direct.err.exp (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-fail-assert-equal-function-direct.nix (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-fail-assert-equal-int-float.err.exp (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-fail-assert-equal-int-float.nix (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-fail-assert-equal-ints.err.exp (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-fail-assert-equal-ints.nix (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-fail-assert-equal-list-length.err.exp (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-fail-assert-equal-list-length.nix (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-fail-assert-equal-paths.err.exp (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-fail-assert-equal-paths.nix (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-fail-assert-equal-type-nested.err.exp (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-fail-assert-equal-type-nested.nix (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-fail-assert-equal-type.err.exp (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-fail-assert-equal-type.nix (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-fail-assert-nested-bool.err.exp (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-fail-assert-nested-bool.nix (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-fail-assert.err.exp (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-fail-assert.nix (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-fail-attr-name-type.err.exp (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-fail-attr-name-type.nix (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-fail-bad-string-interpolation-1.err.exp (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-fail-bad-string-interpolation-1.nix (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-fail-bad-string-interpolation-2.err.exp (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-fail-bad-string-interpolation-2.nix (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-fail-bad-string-interpolation-3.err.exp (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-fail-bad-string-interpolation-3.nix (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-fail-bad-string-interpolation-4.err.exp (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-fail-bad-string-interpolation-4.nix (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-fail-blackhole.err.exp (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-fail-blackhole.nix (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-fail-call-primop.err.exp (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-fail-call-primop.nix (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-fail-deepseq.err.exp (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-fail-deepseq.nix (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-fail-derivation-name.err.exp (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-fail-derivation-name.nix (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-fail-derivation-name.postprocess (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-fail-dup-dynamic-attrs.err.exp (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-fail-dup-dynamic-attrs.nix (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-fail-duplicate-traces.err.exp (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-fail-duplicate-traces.nix (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-fail-eol-1.err.exp (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-fail-eol-1.nix (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-fail-eol-2.err.exp (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-fail-eol-2.nix (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-fail-eol-3.err.exp (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-fail-eol-3.nix (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-fail-fetchTree-negative.err.exp (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-fail-fetchTree-negative.nix (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-fail-fetchurl-baseName-attrs-name.err.exp (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-fail-fetchurl-baseName-attrs-name.nix (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-fail-fetchurl-baseName-attrs.err.exp (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-fail-fetchurl-baseName-attrs.nix (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-fail-fetchurl-baseName.err.exp (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-fail-fetchurl-baseName.nix (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-fail-flake-ref-to-string-negative-integer.err.exp (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-fail-flake-ref-to-string-negative-integer.nix (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-fail-foldlStrict-strict-op-application.err.exp (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-fail-foldlStrict-strict-op-application.nix (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-fail-fromJSON-overflowing.err.exp (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-fail-fromJSON-overflowing.nix (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-fail-fromTOML-timestamps.err.exp (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-fail-fromTOML-timestamps.nix (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-fail-hashfile-missing.err.exp (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-fail-hashfile-missing.nix (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-fail-infinite-recursion-lambda.err.exp (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-fail-infinite-recursion-lambda.flags (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-fail-infinite-recursion-lambda.nix (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-fail-list.err.exp (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-fail-list.nix (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-fail-missing-arg.err.exp (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-fail-missing-arg.nix (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-fail-mutual-recursion.err.exp (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-fail-mutual-recursion.nix (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-fail-nested-list-items.err.exp (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-fail-nested-list-items.nix (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-fail-nonexist-path.err.exp (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-fail-nonexist-path.nix (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-fail-not-throws.err.exp (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-fail-not-throws.nix (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-fail-overflowing-add.err.exp (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-fail-overflowing-add.nix (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-fail-overflowing-div.err.exp (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-fail-overflowing-div.nix (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-fail-overflowing-mul.err.exp (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-fail-overflowing-mul.nix (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-fail-overflowing-sub.err.exp (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-fail-overflowing-sub.nix (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-fail-path-slash.err.exp (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-fail-path-slash.nix (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-fail-pipe-operators.err.exp (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-fail-pipe-operators.nix (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-fail-recursion.err.exp (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-fail-recursion.nix (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-fail-remove.err.exp (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-fail-remove.nix (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-fail-scope-5.err.exp (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-fail-scope-5.nix (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-fail-seq.err.exp (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-fail-seq.nix (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-fail-set-override.err.exp (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-fail-set-override.nix (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-fail-set.err.exp (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-fail-set.nix (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-fail-substring.err.exp (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-fail-substring.nix (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-fail-to-path.err.exp (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-fail-to-path.nix (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-fail-toJSON.err.exp (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-fail-toJSON.nix (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-fail-undeclared-arg.err.exp (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-fail-undeclared-arg.nix (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-fail-using-set-as-attr-name.err.exp (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-fail-using-set-as-attr-name.nix (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-any-all.exp (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-any-all.nix (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-arithmetic.exp (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-arithmetic.nix (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-attrnames.exp (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-attrnames.nix (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-attrs.exp (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-attrs.nix (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-attrs2.exp (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-attrs2.nix (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-attrs3.exp (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-attrs3.nix (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-attrs4.exp (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-attrs4.nix (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-attrs5.exp (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-attrs5.nix (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-attrs6.exp (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-attrs6.nix (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-autoargs.exp (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-autoargs.flags (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-autoargs.nix (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-backslash-newline-1.exp (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-backslash-newline-1.nix (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-backslash-newline-2.exp (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-backslash-newline-2.nix (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-baseNameOf.exp (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-baseNameOf.nix (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-builtins-add.exp (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-builtins-add.nix (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-builtins.exp (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-builtins.nix (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-callable-attrs.exp (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-callable-attrs.nix (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-catattrs.exp (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-catattrs.nix (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-closure.exp (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-closure.exp.xml (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-closure.nix (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-comments.exp (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-comments.nix (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-concat.exp (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-concat.nix (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-concatmap.exp (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-concatmap.nix (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-concatstringssep.exp (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-concatstringssep.nix (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-context-introspection.exp (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-context-introspection.nix (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-context.exp (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-context.nix (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-convertHash.err.exp (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-convertHash.exp (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-convertHash.nix (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-curpos.exp (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-curpos.nix (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-deepseq.exp (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-deepseq.nix (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-delayed-with-inherit.exp (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-delayed-with-inherit.nix (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-delayed-with.exp (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-delayed-with.nix (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-deprecate-cursed-or.err.exp (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-deprecate-cursed-or.exp (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-deprecate-cursed-or.nix (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-derivation-legacy.err.exp (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-derivation-legacy.exp (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-derivation-legacy.nix (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-dynamic-attrs-2.exp (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-dynamic-attrs-2.nix (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-dynamic-attrs-bare.exp (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-dynamic-attrs-bare.nix (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-dynamic-attrs.exp (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-dynamic-attrs.nix (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-elem.exp (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-elem.nix (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-empty-args.exp (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-empty-args.nix (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-eq-derivations.exp (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-eq-derivations.nix (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-eq.exp (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-eq.nix (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-filter.exp (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-filter.nix (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-flake-ref-to-string.exp (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-flake-ref-to-string.nix (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-flatten.exp (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-flatten.nix (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-float.exp (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-float.nix (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-floor-ceil.exp (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-floor-ceil.nix (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-foldlStrict-lazy-elements.exp (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-foldlStrict-lazy-elements.nix (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-foldlStrict-lazy-initial-accumulator.exp (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-foldlStrict-lazy-initial-accumulator.nix (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-foldlStrict.exp (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-foldlStrict.nix (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-fromTOML-timestamps.exp (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-fromTOML-timestamps.flags (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-fromTOML-timestamps.nix (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-fromTOML.exp (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-fromTOML.nix (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-fromjson-escapes.exp (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-fromjson-escapes.nix (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-fromjson.exp (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-fromjson.nix (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-functionargs.exp (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-functionargs.exp.xml (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-functionargs.nix (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-getattrpos-functionargs.exp (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-getattrpos-functionargs.nix (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-getattrpos-undefined.exp (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-getattrpos-undefined.nix (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-getattrpos.exp (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-getattrpos.nix (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-getenv.exp (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-getenv.nix (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-groupBy.exp (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-groupBy.nix (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-hash.exp (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-hashfile.exp (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-hashfile.nix (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-hashstring.exp (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-hashstring.nix (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-if.exp (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-if.nix (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-import.exp (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-import.nix (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-ind-string.exp (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-ind-string.nix (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-inherit-attr-pos.exp (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-inherit-attr-pos.nix (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-inherit-from.err.exp (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-inherit-from.exp (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-inherit-from.nix (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-intersectAttrs.exp (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-intersectAttrs.nix (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-let.exp (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-let.nix (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-list.exp (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-list.nix (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-listtoattrs.exp (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-listtoattrs.nix (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-logic.exp (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-logic.nix (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-map.exp (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-map.nix (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-mapattrs.exp (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-mapattrs.nix (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-merge-dynamic-attrs.exp (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-merge-dynamic-attrs.nix (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-nested-with.exp (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-nested-with.nix (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-new-let.exp (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-new-let.nix (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-null-dynamic-attrs.exp (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-null-dynamic-attrs.nix (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-overrides.exp (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-overrides.nix (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-parse-flake-ref.exp (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-parse-flake-ref.nix (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-partition.exp (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-partition.nix (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-path-string-interpolation.exp (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-path-string-interpolation.nix (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-path.exp (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-path.nix (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-pathexists.exp (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-pathexists.nix (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-patterns.exp (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-patterns.nix (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-print.err.exp (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-print.exp (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-print.nix (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-readDir.exp (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-readDir.nix (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-readFileType.exp (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-readFileType.nix (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-readfile.exp (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-readfile.nix (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-redefine-builtin.exp (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-redefine-builtin.nix (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-regex-match.exp (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-regex-match.nix (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-regex-split.exp (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-regex-split.nix (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-regression-20220122.exp (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-regression-20220122.nix (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-regression-20220125.exp (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-regression-20220125.nix (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-remove.exp (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-remove.nix (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-repeated-empty-attrs.exp (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-repeated-empty-attrs.nix (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-repeated-empty-list.exp (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-repeated-empty-list.nix (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-replacestrings.exp (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-replacestrings.nix (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-scope-1.exp (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-scope-1.nix (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-scope-2.exp (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-scope-2.nix (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-scope-3.exp (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-scope-3.nix (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-scope-4.exp (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-scope-4.nix (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-scope-6.exp (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-scope-6.nix (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-scope-7.exp (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-scope-7.nix (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-search-path.exp (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-search-path.flags (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-search-path.nix (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-seq.exp (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-seq.nix (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-sort.exp (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-sort.nix (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-splitversion.exp (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-splitversion.nix (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-string.exp (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-string.nix (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-strings-as-attrs-names.exp (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-strings-as-attrs-names.nix (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-substring-context.exp (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-substring-context.nix (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-substring.exp (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-substring.nix (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-symlink-resolution.exp (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-symlink-resolution.nix (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-tail-call-1.exp-disabled (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-tail-call-1.nix (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-tojson.exp (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-tojson.nix (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-toxml.exp (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-toxml.nix (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-toxml2.exp (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-toxml2.nix (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-tryeval.exp (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-tryeval.nix (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-types.exp (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-types.nix (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-versions.exp (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-versions.nix (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-with.exp (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-with.nix (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-xml.exp.xml (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-xml.nix (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-zipAttrsWith.exp (100%) rename {tests/functional => src/nix-functional-tests}/lang/eval-okay-zipAttrsWith.nix (100%) rename {tests/functional => src/nix-functional-tests}/lang/imported.nix (100%) rename {tests/functional => src/nix-functional-tests}/lang/imported2.nix (100%) rename {tests/functional => src/nix-functional-tests}/lang/lib.nix (100%) rename {tests/functional => src/nix-functional-tests}/lang/non-eval-fail-bad-drvPath.nix (100%) rename {tests/functional => src/nix-functional-tests}/lang/parse-fail-dup-attrs-1.err.exp (100%) rename {tests/functional => src/nix-functional-tests}/lang/parse-fail-dup-attrs-1.nix (100%) rename {tests/functional => src/nix-functional-tests}/lang/parse-fail-dup-attrs-2.err.exp (100%) rename {tests/functional => src/nix-functional-tests}/lang/parse-fail-dup-attrs-2.nix (100%) rename {tests/functional => src/nix-functional-tests}/lang/parse-fail-dup-attrs-3.err.exp (100%) rename {tests/functional => src/nix-functional-tests}/lang/parse-fail-dup-attrs-3.nix (100%) rename {tests/functional => src/nix-functional-tests}/lang/parse-fail-dup-attrs-4.err.exp (100%) rename {tests/functional => src/nix-functional-tests}/lang/parse-fail-dup-attrs-4.nix (100%) rename {tests/functional => src/nix-functional-tests}/lang/parse-fail-dup-attrs-7.err.exp (100%) rename {tests/functional => src/nix-functional-tests}/lang/parse-fail-dup-attrs-7.nix (100%) rename {tests/functional => src/nix-functional-tests}/lang/parse-fail-dup-formals.err.exp (100%) rename {tests/functional => src/nix-functional-tests}/lang/parse-fail-dup-formals.nix (100%) rename {tests/functional => src/nix-functional-tests}/lang/parse-fail-eof-in-string.err.exp (100%) rename {tests/functional => src/nix-functional-tests}/lang/parse-fail-eof-in-string.nix (100%) rename {tests/functional => src/nix-functional-tests}/lang/parse-fail-eof-pos.err.exp (100%) rename {tests/functional => src/nix-functional-tests}/lang/parse-fail-eof-pos.nix (100%) rename {tests/functional => src/nix-functional-tests}/lang/parse-fail-mixed-nested-attrs1.err.exp (100%) rename {tests/functional => src/nix-functional-tests}/lang/parse-fail-mixed-nested-attrs1.nix (100%) rename {tests/functional => src/nix-functional-tests}/lang/parse-fail-mixed-nested-attrs2.err.exp (100%) rename {tests/functional => src/nix-functional-tests}/lang/parse-fail-mixed-nested-attrs2.nix (100%) rename {tests/functional => src/nix-functional-tests}/lang/parse-fail-patterns-1.err.exp (100%) rename {tests/functional => src/nix-functional-tests}/lang/parse-fail-patterns-1.nix (100%) rename {tests/functional => src/nix-functional-tests}/lang/parse-fail-regression-20060610.err.exp (100%) rename {tests/functional => src/nix-functional-tests}/lang/parse-fail-regression-20060610.nix (100%) rename {tests/functional => src/nix-functional-tests}/lang/parse-fail-undef-var-2.err.exp (100%) rename {tests/functional => src/nix-functional-tests}/lang/parse-fail-undef-var-2.nix (100%) rename {tests/functional => src/nix-functional-tests}/lang/parse-fail-undef-var.err.exp (100%) rename {tests/functional => src/nix-functional-tests}/lang/parse-fail-undef-var.nix (100%) rename {tests/functional => src/nix-functional-tests}/lang/parse-fail-utf8.err.exp (100%) rename {tests/functional => src/nix-functional-tests}/lang/parse-fail-utf8.nix (100%) rename {tests/functional => src/nix-functional-tests}/lang/parse-okay-1.exp (100%) rename {tests/functional => src/nix-functional-tests}/lang/parse-okay-1.nix (100%) rename {tests/functional => src/nix-functional-tests}/lang/parse-okay-crlf.exp (100%) rename {tests/functional => src/nix-functional-tests}/lang/parse-okay-crlf.nix (100%) rename {tests/functional => src/nix-functional-tests}/lang/parse-okay-dup-attrs-5.exp (100%) rename {tests/functional => src/nix-functional-tests}/lang/parse-okay-dup-attrs-5.nix (100%) rename {tests/functional => src/nix-functional-tests}/lang/parse-okay-dup-attrs-6.exp (100%) rename {tests/functional => src/nix-functional-tests}/lang/parse-okay-dup-attrs-6.nix (100%) rename {tests/functional => src/nix-functional-tests}/lang/parse-okay-ind-string.exp (100%) rename {tests/functional => src/nix-functional-tests}/lang/parse-okay-ind-string.nix (100%) rename {tests/functional => src/nix-functional-tests}/lang/parse-okay-inherits.exp (100%) rename {tests/functional => src/nix-functional-tests}/lang/parse-okay-inherits.nix (100%) rename {tests/functional => src/nix-functional-tests}/lang/parse-okay-mixed-nested-attrs-1.exp (100%) rename {tests/functional => src/nix-functional-tests}/lang/parse-okay-mixed-nested-attrs-1.nix (100%) rename {tests/functional => src/nix-functional-tests}/lang/parse-okay-mixed-nested-attrs-2.exp (100%) rename {tests/functional => src/nix-functional-tests}/lang/parse-okay-mixed-nested-attrs-2.nix (100%) rename {tests/functional => src/nix-functional-tests}/lang/parse-okay-mixed-nested-attrs-3.exp (100%) rename {tests/functional => src/nix-functional-tests}/lang/parse-okay-mixed-nested-attrs-3.nix (100%) rename {tests/functional => src/nix-functional-tests}/lang/parse-okay-regression-20041027.exp (100%) rename {tests/functional => src/nix-functional-tests}/lang/parse-okay-regression-20041027.nix (100%) rename {tests/functional => src/nix-functional-tests}/lang/parse-okay-regression-751.exp (100%) rename {tests/functional => src/nix-functional-tests}/lang/parse-okay-regression-751.nix (100%) rename {tests/functional => src/nix-functional-tests}/lang/parse-okay-subversion.exp (100%) rename {tests/functional => src/nix-functional-tests}/lang/parse-okay-subversion.nix (100%) rename {tests/functional => src/nix-functional-tests}/lang/parse-okay-url.exp (100%) rename {tests/functional => src/nix-functional-tests}/lang/parse-okay-url.nix (100%) rename {tests/functional => src/nix-functional-tests}/lang/readDir/bar (100%) rename {tests/functional => src/nix-functional-tests}/lang/readDir/foo/git-hates-directories (100%) rename {tests/functional => src/nix-functional-tests}/lang/readDir/ldir (100%) rename {tests/functional => src/nix-functional-tests}/lang/readDir/linked (100%) rename {tests/functional => src/nix-functional-tests}/lang/symlink-resolution/broken (100%) rename {tests/functional => src/nix-functional-tests}/lang/symlink-resolution/foo/lib/default.nix (100%) rename {tests/functional => src/nix-functional-tests}/lang/symlink-resolution/foo/overlays (100%) rename {tests/functional => src/nix-functional-tests}/lang/symlink-resolution/overlays/overlay.nix (100%) rename {tests/functional => src/nix-functional-tests}/legacy-ssh-store.sh (100%) rename {tests/functional => src/nix-functional-tests}/linux-sandbox-cert-test.nix (100%) rename {tests/functional => src/nix-functional-tests}/linux-sandbox.sh (100%) rename {tests/functional => src/nix-functional-tests}/local-overlay-store/add-lower-inner.sh (100%) rename {tests/functional => src/nix-functional-tests}/local-overlay-store/add-lower.sh (100%) rename {tests/functional => src/nix-functional-tests}/local-overlay-store/bad-uris.sh (100%) rename {tests/functional => src/nix-functional-tests}/local-overlay-store/build-inner.sh (100%) rename {tests/functional => src/nix-functional-tests}/local-overlay-store/build.sh (100%) rename {tests/functional => src/nix-functional-tests}/local-overlay-store/check-post-init-inner.sh (100%) rename {tests/functional => src/nix-functional-tests}/local-overlay-store/check-post-init.sh (100%) rename {tests/functional => src/nix-functional-tests}/local-overlay-store/common.sh (100%) rename {tests/functional => src/nix-functional-tests}/local-overlay-store/delete-duplicate-inner.sh (100%) rename {tests/functional => src/nix-functional-tests}/local-overlay-store/delete-duplicate.sh (100%) rename {tests/functional => src/nix-functional-tests}/local-overlay-store/delete-refs-inner.sh (100%) rename {tests/functional => src/nix-functional-tests}/local-overlay-store/delete-refs.sh (100%) rename {tests/functional => src/nix-functional-tests}/local-overlay-store/gc-inner.sh (100%) rename {tests/functional => src/nix-functional-tests}/local-overlay-store/gc.sh (100%) rename {tests/functional => src/nix-functional-tests}/local-overlay-store/local.mk (100%) rename {tests/functional => src/nix-functional-tests}/local-overlay-store/meson.build (100%) rename {tests/functional => src/nix-functional-tests}/local-overlay-store/optimise-inner.sh (100%) rename {tests/functional => src/nix-functional-tests}/local-overlay-store/optimise.sh (100%) rename {tests/functional => src/nix-functional-tests}/local-overlay-store/redundant-add-inner.sh (100%) rename {tests/functional => src/nix-functional-tests}/local-overlay-store/redundant-add.sh (100%) rename {tests/functional => src/nix-functional-tests}/local-overlay-store/remount.sh (100%) rename {tests/functional => src/nix-functional-tests}/local-overlay-store/stale-file-handle-inner.sh (100%) rename {tests/functional => src/nix-functional-tests}/local-overlay-store/stale-file-handle.sh (100%) rename {tests/functional => src/nix-functional-tests}/local-overlay-store/verify-inner.sh (100%) rename {tests/functional => src/nix-functional-tests}/local-overlay-store/verify.sh (100%) rename {tests/functional => src/nix-functional-tests}/local.mk (100%) rename {tests/functional => src/nix-functional-tests}/logging.sh (100%) rename {tests/functional => src/nix-functional-tests}/meson.build (98%) rename {tests/functional => src/nix-functional-tests}/misc.sh (100%) rename {tests/functional => src/nix-functional-tests}/multiple-outputs.nix (100%) rename {tests/functional => src/nix-functional-tests}/multiple-outputs.sh (100%) rename {tests/functional => src/nix-functional-tests}/name-after-node.nar (100%) rename {tests/functional => src/nix-functional-tests}/nar-access.nix (100%) rename {tests/functional => src/nix-functional-tests}/nar-access.sh (100%) rename {tests/functional => src/nix-functional-tests}/nars.sh (100%) rename {tests/functional => src/nix-functional-tests}/nested-sandboxing.sh (76%) rename {tests/functional => src/nix-functional-tests}/nested-sandboxing/command.sh (100%) rename {tests/functional => src/nix-functional-tests}/nested-sandboxing/runner.nix (100%) rename {tests/functional => src/nix-functional-tests}/nix-build-examples.nix (100%) rename {tests/functional => src/nix-functional-tests}/nix-build.sh (100%) rename {tests/functional => src/nix-functional-tests}/nix-channel.sh (100%) rename {tests/functional => src/nix-functional-tests}/nix-collect-garbage-d.sh (100%) rename {tests/functional => src/nix-functional-tests}/nix-copy-ssh-common.sh (100%) rename {tests/functional => src/nix-functional-tests}/nix-copy-ssh-ng.sh (100%) rename {tests/functional => src/nix-functional-tests}/nix-copy-ssh.sh (100%) rename {tests/functional => src/nix-functional-tests}/nix-daemon-untrusting.sh (100%) rename {tests/functional => src/nix-functional-tests}/nix-profile.sh (100%) rename {tests/functional => src/nix-functional-tests}/nix-shell.sh (100%) rename {tests/functional => src/nix-functional-tests}/nix_path.sh (100%) rename {tests/functional => src/nix-functional-tests}/nul.nar (100%) rename {tests/functional => src/nix-functional-tests}/optimise-store.sh (100%) rename {tests/functional => src/nix-functional-tests}/output-normalization.sh (100%) rename {tests/functional => src/nix-functional-tests}/package.nix (96%) rename {tests/functional => src/nix-functional-tests}/parallel.builder.sh (100%) rename {tests/functional => src/nix-functional-tests}/parallel.nix (100%) rename {tests/functional => src/nix-functional-tests}/parallel.sh (100%) rename {tests/functional => src/nix-functional-tests}/pass-as-file.sh (100%) rename {tests/functional => src/nix-functional-tests}/path-from-hash-part.sh (100%) rename {tests/functional => src/nix-functional-tests}/path-info.sh (100%) rename {tests/functional => src/nix-functional-tests}/path.nix (100%) rename {tests/functional => src/nix-functional-tests}/placeholders.sh (100%) rename {tests/functional => src/nix-functional-tests}/plugins.sh (100%) rename {tests/functional => src/nix-functional-tests}/plugins/local.mk (100%) rename {tests/functional => src/nix-functional-tests}/plugins/meson.build (100%) rename {tests/functional => src/nix-functional-tests}/plugins/plugintest.cc (100%) rename {tests/functional => src/nix-functional-tests}/post-hook.sh (100%) rename {tests/functional => src/nix-functional-tests}/pure-eval.nix (100%) rename {tests/functional => src/nix-functional-tests}/pure-eval.sh (100%) rename {tests/functional => src/nix-functional-tests}/push-to-store-old.sh (100%) rename {tests/functional => src/nix-functional-tests}/push-to-store.sh (100%) rename {tests/functional => src/nix-functional-tests}/read-only-store.sh (100%) rename {tests/functional => src/nix-functional-tests}/readfile-context.nix (100%) rename {tests/functional => src/nix-functional-tests}/readfile-context.sh (100%) rename {tests/functional => src/nix-functional-tests}/recursive.nix (100%) rename {tests/functional => src/nix-functional-tests}/recursive.sh (100%) rename {tests/functional => src/nix-functional-tests}/referrers.sh (100%) rename {tests/functional => src/nix-functional-tests}/remote-store.sh (100%) rename {tests/functional => src/nix-functional-tests}/repair.sh (100%) rename {tests/functional => src/nix-functional-tests}/repl.sh (98%) rename {tests/functional => src/nix-functional-tests}/repl/characterisation/empty (100%) rename {tests/functional => src/nix-functional-tests}/repl/doc-comment-curried-args.expected (80%) rename {tests/functional => src/nix-functional-tests}/repl/doc-comment-curried-args.in (100%) rename {tests/functional => src/nix-functional-tests}/repl/doc-comment-formals.expected (76%) rename {tests/functional => src/nix-functional-tests}/repl/doc-comment-formals.in (100%) rename {tests/functional => src/nix-functional-tests}/repl/doc-comment-function.expected (61%) rename {tests/functional => src/nix-functional-tests}/repl/doc-comment-function.in (100%) rename {tests/functional => src/nix-functional-tests}/repl/doc-comment-function.nix (100%) rename {tests/functional => src/nix-functional-tests}/repl/doc-comments.nix (100%) rename {tests/functional => src/nix-functional-tests}/repl/doc-compact.expected (65%) rename {tests/functional => src/nix-functional-tests}/repl/doc-compact.in (100%) rename {tests/functional => src/nix-functional-tests}/repl/doc-constant.expected (77%) rename {tests/functional => src/nix-functional-tests}/repl/doc-constant.in (100%) rename {tests/functional => src/nix-functional-tests}/repl/doc-floatedIn.expected (68%) rename {tests/functional => src/nix-functional-tests}/repl/doc-floatedIn.in (100%) rename {tests/functional => src/nix-functional-tests}/repl/doc-functor.expected (68%) rename {tests/functional => src/nix-functional-tests}/repl/doc-functor.in (100%) rename {tests/functional => src/nix-functional-tests}/repl/doc-functor.nix (100%) rename {tests/functional => src/nix-functional-tests}/repl/doc-lambda-flavors.expected (58%) rename {tests/functional => src/nix-functional-tests}/repl/doc-lambda-flavors.in (100%) rename {tests/functional => src/nix-functional-tests}/repl/doc-measurement.expected (69%) rename {tests/functional => src/nix-functional-tests}/repl/doc-measurement.in (100%) rename {tests/functional => src/nix-functional-tests}/repl/doc-multiply.expected (77%) rename {tests/functional => src/nix-functional-tests}/repl/doc-multiply.in (100%) rename {tests/functional => src/nix-functional-tests}/repl/doc-unambiguous.expected (67%) rename {tests/functional => src/nix-functional-tests}/repl/doc-unambiguous.in (100%) rename {tests/functional => src/nix-functional-tests}/repl/pretty-print-idempotent.expected (100%) rename {tests/functional => src/nix-functional-tests}/repl/pretty-print-idempotent.in (100%) rename {tests/functional => src/nix-functional-tests}/repl/pretty-print-idempotent.nix (100%) rename {tests/functional => src/nix-functional-tests}/restricted.nix (100%) rename {tests/functional => src/nix-functional-tests}/restricted.sh (100%) rename {tests/functional => src/nix-functional-tests}/search.nix (100%) rename {tests/functional => src/nix-functional-tests}/search.sh (100%) rename {tests/functional => src/nix-functional-tests}/secure-drv-outputs.nix (100%) rename {tests/functional => src/nix-functional-tests}/secure-drv-outputs.sh (100%) rename {tests/functional => src/nix-functional-tests}/selfref-gc.sh (100%) rename {tests/functional => src/nix-functional-tests}/shell-hello.nix (100%) rename {tests/functional => src/nix-functional-tests}/shell.nix (100%) rename {tests/functional => src/nix-functional-tests}/shell.sh (100%) rename {tests/functional => src/nix-functional-tests}/shell.shebang.expr (100%) rename {tests/functional => src/nix-functional-tests}/shell.shebang.legacy.expr (100%) rename {tests/functional => src/nix-functional-tests}/shell.shebang.nix (100%) rename {tests/functional => src/nix-functional-tests}/shell.shebang.rb (100%) rename {tests/functional => src/nix-functional-tests}/shell.shebang.sh (100%) rename {tests/functional => src/nix-functional-tests}/signing.sh (100%) rename {tests/functional => src/nix-functional-tests}/simple-failing.nix (100%) rename {tests/functional => src/nix-functional-tests}/simple.builder.sh (100%) rename {tests/functional => src/nix-functional-tests}/simple.nix (100%) rename {tests/functional => src/nix-functional-tests}/simple.sh (100%) rename {tests/functional => src/nix-functional-tests}/slash.nar (100%) rename {tests/functional => src/nix-functional-tests}/ssh-relay.sh (100%) rename {tests/functional => src/nix-functional-tests}/store-info.sh (100%) rename {tests/functional => src/nix-functional-tests}/structured-attrs-shell.nix (100%) rename {tests/functional => src/nix-functional-tests}/structured-attrs.nix (100%) rename {tests/functional => src/nix-functional-tests}/structured-attrs.sh (100%) rename {tests/functional => src/nix-functional-tests}/substitute-with-invalid-ca.sh (100%) rename {tests/functional => src/nix-functional-tests}/suggestions.sh (100%) rename {tests/functional => src/nix-functional-tests}/supplementary-groups.sh (100%) rename {tests/functional => src/nix-functional-tests}/symlink-derivation.nix (100%) rename {tests/functional => src/nix-functional-tests}/tarball.sh (100%) rename {tests/functional => src/nix-functional-tests}/test-infra.sh (100%) rename {tests/functional => src/nix-functional-tests}/test-libstoreconsumer.sh (100%) rename {tests/functional => src/nix-functional-tests}/test-libstoreconsumer/README.md (100%) rename {tests/functional => src/nix-functional-tests}/test-libstoreconsumer/local.mk (100%) rename {tests/functional => src/nix-functional-tests}/test-libstoreconsumer/main.cc (100%) rename {tests/functional => src/nix-functional-tests}/test-libstoreconsumer/meson.build (100%) rename {tests/functional => src/nix-functional-tests}/timeout.nix (100%) rename {tests/functional => src/nix-functional-tests}/timeout.sh (100%) rename {tests/functional => src/nix-functional-tests}/toString-path.sh (100%) rename {tests/functional => src/nix-functional-tests}/tree.tar.gz (100%) rename {tests/functional => src/nix-functional-tests}/undefined-variable.nix (100%) rename {tests/functional => src/nix-functional-tests}/unnormalized.nar (100%) rename {tests/functional => src/nix-functional-tests}/user-envs-migration.sh (100%) rename {tests/functional => src/nix-functional-tests}/user-envs-test-case.sh (100%) rename {tests/functional => src/nix-functional-tests}/user-envs.builder.sh (100%) rename {tests/functional => src/nix-functional-tests}/user-envs.nix (100%) rename {tests/functional => src/nix-functional-tests}/user-envs.sh (100%) rename {tests/functional => src/nix-functional-tests}/why-depends.sh (100%) rename {tests/functional => src/nix-functional-tests}/zstd.sh (100%) diff --git a/.github/labeler.yml b/.github/labeler.yml index 97ca9284d0e..d4614e38d16 100644 --- a/.github/labeler.yml +++ b/.github/labeler.yml @@ -39,5 +39,5 @@ # Unit tests - any-glob-to-any-file: "src/*/tests/**/*" # Functional and integration tests - - any-glob-to-any-file: "tests/functional/**/*" + - any-glob-to-any-file: "src/nix-functional-tests/**/*" diff --git a/.gitignore b/.gitignore index 4d38caed289..ae974ab388c 100644 --- a/.gitignore +++ b/.gitignore @@ -95,25 +95,25 @@ perl/Makefile.config /src/build-remote/build-remote -# /tests/functional/ -/tests/functional/test-tmp -/tests/functional/common/subst-vars.sh -/tests/functional/result* -/tests/functional/restricted-innocent -/tests/functional/shell -/tests/functional/shell.drv -/tests/functional/config.nix -/tests/functional/ca/config.nix -/tests/functional/dyn-drv/config.nix -/tests/functional/repl-result-out -/tests/functional/debugger-test-out -/tests/functional/test-libstoreconsumer/test-libstoreconsumer - -# /tests/functional/lang/ -/tests/functional/lang/*.out -/tests/functional/lang/*.out.xml -/tests/functional/lang/*.err -/tests/functional/lang/*.ast +# /src/nix-functional-tests/ +/src/nix-functional-tests/test-tmp +/src/nix-functional-tests/common/subst-vars.sh +/src/nix-functional-tests/result* +/src/nix-functional-tests/restricted-innocent +/src/nix-functional-tests/shell +/src/nix-functional-tests/shell.drv +/src/nix-functional-tests/config.nix +/src/nix-functional-tests/ca/config.nix +/src/nix-functional-tests/dyn-drv/config.nix +/src/nix-functional-tests/repl-result-out +/src/nix-functional-tests/debugger-test-out +/src/nix-functional-tests/test-libstoreconsumer/test-libstoreconsumer + +# /src/nix-functional-tests/lang/ +/src/nix-functional-tests/lang/*.out +/src/nix-functional-tests/lang/*.out.xml +/src/nix-functional-tests/lang/*.err +/src/nix-functional-tests/lang/*.ast /perl/lib/Nix/Config.pm /perl/lib/Nix/Store.cc diff --git a/.shellcheckrc b/.shellcheckrc index de98055f719..d0b46b9e63c 100644 --- a/.shellcheckrc +++ b/.shellcheckrc @@ -1,4 +1,4 @@ external-sources=true source-path=SCRIPTDIR -# Hack for scripts in e.g. tests/functional/ca +# Hack for scripts in e.g. src/nix-functional-tests/ca source-path=SCRIPTDIR/.. diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index ad867896269..e7701f3a61d 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -76,7 +76,7 @@ Check out the [security policy](https://github.com/NixOS/nix/security/policy). - [ ] Fixes an [idea approved](https://github.com/NixOS/nix/labels/idea%20approved) issue - [ ] Tests, as appropriate: - - Functional tests – [`tests/functional/**.sh`](./tests/functional) + - Functional tests – [`src/nix-functional-tests/**.sh`](./src/nix-functional-tests) - Unit tests – [`src/*/tests`](./src/) - Integration tests – [`tests/nixos/*`](./tests/nixos) - [ ] User documentation in the [manual](./doc/manual/source) diff --git a/Makefile b/Makefile index 757ea54b927..bfc64f345d2 100644 --- a/Makefile +++ b/Makefile @@ -53,14 +53,14 @@ endif ifeq ($(ENABLE_FUNCTIONAL_TESTS), yes) ifdef HOST_UNIX makefiles += \ - tests/functional/local.mk \ - tests/functional/flakes/local.mk \ - tests/functional/ca/local.mk \ - tests/functional/git-hashing/local.mk \ - tests/functional/dyn-drv/local.mk \ - tests/functional/local-overlay-store/local.mk \ - tests/functional/test-libstoreconsumer/local.mk \ - tests/functional/plugins/local.mk + src/nix-functional-tests/local.mk \ + src/nix-functional-tests/flakes/local.mk \ + src/nix-functional-tests/ca/local.mk \ + src/nix-functional-tests/git-hashing/local.mk \ + src/nix-functional-tests/dyn-drv/local.mk \ + src/nix-functional-tests/local-overlay-store/local.mk \ + src/nix-functional-tests/test-libstoreconsumer/local.mk \ + src/nix-functional-tests/plugins/local.mk endif endif diff --git a/doc/manual/source/development/testing.md b/doc/manual/source/development/testing.md index 0df72cc38b7..aac7c200b10 100644 --- a/doc/manual/source/development/testing.md +++ b/doc/manual/source/development/testing.md @@ -128,7 +128,7 @@ On other platforms they wouldn't be run at all. ## Functional tests -The functional tests reside under the `tests/functional` directory and are listed in `tests/functional/local.mk`. +The functional tests reside under the `src/nix-functional-tests` directory and are listed in `src/nix-functional-tests/local.mk`. Each test is a bash script. Functional tests are run during `installCheck` in the `nix` package build, as well as separately from the build, in VM tests. @@ -145,7 +145,7 @@ $ mesonCheckPhase Sometimes it is useful to group related tests so they can be easily run together without running the entire test suite. Each test group is in a subdirectory of `tests`. -For example, `tests/functional/ca/meson.build` defines a `ca` test group for content-addressed derivation outputs. +For example, `src/nix-functional-tests/ca/meson.build` defines a `ca` test group for content-addressed derivation outputs. That test group can be run like this: @@ -184,7 +184,7 @@ regardless of whether the test succeeds or fails. Tests can be also run directly without `meson`: ```shell-session -$ TEST_NAME=${testName} NIX_REMOTE='' PS4='+(${BASH_SOURCE[0]-$0}:$LINENO) tests/functional/${testName}.sh +$ TEST_NAME=${testName} NIX_REMOTE='' PS4='+(${BASH_SOURCE[0]-$0}:$LINENO) src/nix-functional-tests/${testName}.sh +(${testName}.sh:1) foo output from foo +(${testName}.sh:2) bar @@ -217,7 +217,7 @@ edit it like so: Then, running the test with `./mk/debug-test.sh` will drop you into GDB once the script reaches that point: ```shell-session -$ ./mk/debug-test.sh tests/functional/${testName}.sh +$ ./mk/debug-test.sh src/nix-functional-tests/${testName}.sh ... + gdb blash blub GNU gdb (GDB) 12.1 diff --git a/maintainers/flake-module.nix b/maintainers/flake-module.nix index ff3b5e8edbc..ce46d8a9964 100644 --- a/maintainers/flake-module.nix +++ b/maintainers/flake-module.nix @@ -422,8 +422,8 @@ ''^src/nix/verify\.cc$'' ''^src/nix/why-depends\.cc$'' - ''^tests/functional/plugins/plugintest\.cc'' - ''^tests/functional/test-libstoreconsumer/main\.cc'' + ''^src/nix-functional-tests/plugins/plugintest\.cc'' + ''^src/nix-functional-tests/test-libstoreconsumer/main\.cc'' ''^tests/nixos/ca-fd-leak/sender\.c'' ''^tests/nixos/ca-fd-leak/smuggler\.c'' ''^tests/nixos/user-sandboxing/attacker\.c'' @@ -501,155 +501,155 @@ ''^scripts/install-nix-from-closure\.sh$'' ''^scripts/install-systemd-multi-user\.sh$'' ''^src/nix/get-env\.sh$'' - ''^tests/functional/build\.sh$'' - ''^tests/functional/ca/build-dry\.sh$'' - ''^tests/functional/ca/build-with-garbage-path\.sh$'' - ''^tests/functional/ca/common\.sh$'' - ''^tests/functional/ca/concurrent-builds\.sh$'' - ''^tests/functional/ca/eval-store\.sh$'' - ''^tests/functional/ca/gc\.sh$'' - ''^tests/functional/ca/import-from-derivation\.sh$'' - ''^tests/functional/ca/new-build-cmd\.sh$'' - ''^tests/functional/ca/nix-shell\.sh$'' - ''^tests/functional/ca/post-hook\.sh$'' - ''^tests/functional/ca/recursive\.sh$'' - ''^tests/functional/ca/repl\.sh$'' - ''^tests/functional/ca/selfref-gc\.sh$'' - ''^tests/functional/ca/why-depends\.sh$'' - ''^tests/functional/characterisation-test-infra\.sh$'' - ''^tests/functional/check\.sh$'' - ''^tests/functional/common/vars-and-functions\.sh$'' - ''^tests/functional/completions\.sh$'' - ''^tests/functional/compute-levels\.sh$'' - ''^tests/functional/config\.sh$'' - ''^tests/functional/db-migration\.sh$'' - ''^tests/functional/debugger\.sh$'' - ''^tests/functional/dependencies\.builder0\.sh$'' - ''^tests/functional/dependencies\.sh$'' - ''^tests/functional/dump-db\.sh$'' - ''^tests/functional/dyn-drv/build-built-drv\.sh$'' - ''^tests/functional/dyn-drv/common\.sh$'' - ''^tests/functional/dyn-drv/dep-built-drv\.sh$'' - ''^tests/functional/dyn-drv/eval-outputOf\.sh$'' - ''^tests/functional/dyn-drv/old-daemon-error-hack\.sh$'' - ''^tests/functional/dyn-drv/recursive-mod-json\.sh$'' - ''^tests/functional/eval-store\.sh$'' - ''^tests/functional/eval\.sh$'' - ''^tests/functional/export-graph\.sh$'' - ''^tests/functional/export\.sh$'' - ''^tests/functional/extra-sandbox-profile\.sh$'' - ''^tests/functional/fetchClosure\.sh$'' - ''^tests/functional/fetchGit\.sh$'' - ''^tests/functional/fetchGitRefs\.sh$'' - ''^tests/functional/fetchGitSubmodules\.sh$'' - ''^tests/functional/fetchGitVerification\.sh$'' - ''^tests/functional/fetchMercurial\.sh$'' - ''^tests/functional/fetchurl\.sh$'' - ''^tests/functional/fixed\.builder1\.sh$'' - ''^tests/functional/fixed\.builder2\.sh$'' - ''^tests/functional/fixed\.sh$'' - ''^tests/functional/flakes/absolute-paths\.sh$'' - ''^tests/functional/flakes/check\.sh$'' - ''^tests/functional/flakes/common\.sh$'' - ''^tests/functional/flakes/config\.sh$'' - ''^tests/functional/flakes/develop\.sh$'' - ''^tests/functional/flakes/flakes\.sh$'' - ''^tests/functional/flakes/follow-paths\.sh$'' - ''^tests/functional/flakes/prefetch\.sh$'' - ''^tests/functional/flakes/run\.sh$'' - ''^tests/functional/flakes/show\.sh$'' - ''^tests/functional/fmt\.sh$'' - ''^tests/functional/fmt\.simple\.sh$'' - ''^tests/functional/gc-auto\.sh$'' - ''^tests/functional/gc-concurrent\.builder\.sh$'' - ''^tests/functional/gc-concurrent\.sh$'' - ''^tests/functional/gc-concurrent2\.builder\.sh$'' - ''^tests/functional/gc-non-blocking\.sh$'' - ''^tests/functional/gc\.sh$'' - ''^tests/functional/git-hashing/common\.sh$'' - ''^tests/functional/git-hashing/simple\.sh$'' - ''^tests/functional/hash-convert\.sh$'' - ''^tests/functional/help\.sh$'' - ''^tests/functional/impure-derivations\.sh$'' - ''^tests/functional/impure-env\.sh$'' - ''^tests/functional/impure-eval\.sh$'' - ''^tests/functional/install-darwin\.sh$'' - ''^tests/functional/lang\.sh$'' - ''^tests/functional/legacy-ssh-store\.sh$'' - ''^tests/functional/linux-sandbox\.sh$'' - ''^tests/functional/local-overlay-store/add-lower-inner\.sh$'' - ''^tests/functional/local-overlay-store/add-lower\.sh$'' - ''^tests/functional/local-overlay-store/bad-uris\.sh$'' - ''^tests/functional/local-overlay-store/build-inner\.sh$'' - ''^tests/functional/local-overlay-store/build\.sh$'' - ''^tests/functional/local-overlay-store/check-post-init-inner\.sh$'' - ''^tests/functional/local-overlay-store/check-post-init\.sh$'' - ''^tests/functional/local-overlay-store/common\.sh$'' - ''^tests/functional/local-overlay-store/delete-duplicate-inner\.sh$'' - ''^tests/functional/local-overlay-store/delete-duplicate\.sh$'' - ''^tests/functional/local-overlay-store/delete-refs-inner\.sh$'' - ''^tests/functional/local-overlay-store/delete-refs\.sh$'' - ''^tests/functional/local-overlay-store/gc-inner\.sh$'' - ''^tests/functional/local-overlay-store/gc\.sh$'' - ''^tests/functional/local-overlay-store/optimise-inner\.sh$'' - ''^tests/functional/local-overlay-store/optimise\.sh$'' - ''^tests/functional/local-overlay-store/redundant-add-inner\.sh$'' - ''^tests/functional/local-overlay-store/redundant-add\.sh$'' - ''^tests/functional/local-overlay-store/remount\.sh$'' - ''^tests/functional/local-overlay-store/stale-file-handle-inner\.sh$'' - ''^tests/functional/local-overlay-store/stale-file-handle\.sh$'' - ''^tests/functional/local-overlay-store/verify-inner\.sh$'' - ''^tests/functional/local-overlay-store/verify\.sh$'' - ''^tests/functional/logging\.sh$'' - ''^tests/functional/misc\.sh$'' - ''^tests/functional/multiple-outputs\.sh$'' - ''^tests/functional/nar-access\.sh$'' - ''^tests/functional/nested-sandboxing\.sh$'' - ''^tests/functional/nested-sandboxing/command\.sh$'' - ''^tests/functional/nix-build\.sh$'' - ''^tests/functional/nix-channel\.sh$'' - ''^tests/functional/nix-collect-garbage-d\.sh$'' - ''^tests/functional/nix-copy-ssh-common\.sh$'' - ''^tests/functional/nix-copy-ssh-ng\.sh$'' - ''^tests/functional/nix-copy-ssh\.sh$'' - ''^tests/functional/nix-daemon-untrusting\.sh$'' - ''^tests/functional/nix-profile\.sh$'' - ''^tests/functional/nix-shell\.sh$'' - ''^tests/functional/nix_path\.sh$'' - ''^tests/functional/optimise-store\.sh$'' - ''^tests/functional/output-normalization\.sh$'' - ''^tests/functional/parallel\.builder\.sh$'' - ''^tests/functional/parallel\.sh$'' - ''^tests/functional/pass-as-file\.sh$'' - ''^tests/functional/path-from-hash-part\.sh$'' - ''^tests/functional/path-info\.sh$'' - ''^tests/functional/placeholders\.sh$'' - ''^tests/functional/plugins\.sh$'' - ''^tests/functional/post-hook\.sh$'' - ''^tests/functional/pure-eval\.sh$'' - ''^tests/functional/push-to-store-old\.sh$'' - ''^tests/functional/push-to-store\.sh$'' - ''^tests/functional/read-only-store\.sh$'' - ''^tests/functional/readfile-context\.sh$'' - ''^tests/functional/recursive\.sh$'' - ''^tests/functional/referrers\.sh$'' - ''^tests/functional/remote-store\.sh$'' - ''^tests/functional/repair\.sh$'' - ''^tests/functional/restricted\.sh$'' - ''^tests/functional/search\.sh$'' - ''^tests/functional/secure-drv-outputs\.sh$'' - ''^tests/functional/selfref-gc\.sh$'' - ''^tests/functional/shell\.sh$'' - ''^tests/functional/shell\.shebang\.sh$'' - ''^tests/functional/simple\.builder\.sh$'' - ''^tests/functional/supplementary-groups\.sh$'' - ''^tests/functional/toString-path\.sh$'' - ''^tests/functional/user-envs-migration\.sh$'' - ''^tests/functional/user-envs-test-case\.sh$'' - ''^tests/functional/user-envs\.builder\.sh$'' - ''^tests/functional/user-envs\.sh$'' - ''^tests/functional/why-depends\.sh$'' - ''^tests/functional/zstd\.sh$'' + ''^src/nix-functional-tests/build\.sh$'' + ''^src/nix-functional-tests/ca/build-dry\.sh$'' + ''^src/nix-functional-tests/ca/build-with-garbage-path\.sh$'' + ''^src/nix-functional-tests/ca/common\.sh$'' + ''^src/nix-functional-tests/ca/concurrent-builds\.sh$'' + ''^src/nix-functional-tests/ca/eval-store\.sh$'' + ''^src/nix-functional-tests/ca/gc\.sh$'' + ''^src/nix-functional-tests/ca/import-from-derivation\.sh$'' + ''^src/nix-functional-tests/ca/new-build-cmd\.sh$'' + ''^src/nix-functional-tests/ca/nix-shell\.sh$'' + ''^src/nix-functional-tests/ca/post-hook\.sh$'' + ''^src/nix-functional-tests/ca/recursive\.sh$'' + ''^src/nix-functional-tests/ca/repl\.sh$'' + ''^src/nix-functional-tests/ca/selfref-gc\.sh$'' + ''^src/nix-functional-tests/ca/why-depends\.sh$'' + ''^src/nix-functional-tests/characterisation-test-infra\.sh$'' + ''^src/nix-functional-tests/check\.sh$'' + ''^src/nix-functional-tests/common/vars-and-functions\.sh$'' + ''^src/nix-functional-tests/completions\.sh$'' + ''^src/nix-functional-tests/compute-levels\.sh$'' + ''^src/nix-functional-tests/config\.sh$'' + ''^src/nix-functional-tests/db-migration\.sh$'' + ''^src/nix-functional-tests/debugger\.sh$'' + ''^src/nix-functional-tests/dependencies\.builder0\.sh$'' + ''^src/nix-functional-tests/dependencies\.sh$'' + ''^src/nix-functional-tests/dump-db\.sh$'' + ''^src/nix-functional-tests/dyn-drv/build-built-drv\.sh$'' + ''^src/nix-functional-tests/dyn-drv/common\.sh$'' + ''^src/nix-functional-tests/dyn-drv/dep-built-drv\.sh$'' + ''^src/nix-functional-tests/dyn-drv/eval-outputOf\.sh$'' + ''^src/nix-functional-tests/dyn-drv/old-daemon-error-hack\.sh$'' + ''^src/nix-functional-tests/dyn-drv/recursive-mod-json\.sh$'' + ''^src/nix-functional-tests/eval-store\.sh$'' + ''^src/nix-functional-tests/eval\.sh$'' + ''^src/nix-functional-tests/export-graph\.sh$'' + ''^src/nix-functional-tests/export\.sh$'' + ''^src/nix-functional-tests/extra-sandbox-profile\.sh$'' + ''^src/nix-functional-tests/fetchClosure\.sh$'' + ''^src/nix-functional-tests/fetchGit\.sh$'' + ''^src/nix-functional-tests/fetchGitRefs\.sh$'' + ''^src/nix-functional-tests/fetchGitSubmodules\.sh$'' + ''^src/nix-functional-tests/fetchGitVerification\.sh$'' + ''^src/nix-functional-tests/fetchMercurial\.sh$'' + ''^src/nix-functional-tests/fetchurl\.sh$'' + ''^src/nix-functional-tests/fixed\.builder1\.sh$'' + ''^src/nix-functional-tests/fixed\.builder2\.sh$'' + ''^src/nix-functional-tests/fixed\.sh$'' + ''^src/nix-functional-tests/flakes/absolute-paths\.sh$'' + ''^src/nix-functional-tests/flakes/check\.sh$'' + ''^src/nix-functional-tests/flakes/common\.sh$'' + ''^src/nix-functional-tests/flakes/config\.sh$'' + ''^src/nix-functional-tests/flakes/develop\.sh$'' + ''^src/nix-functional-tests/flakes/flakes\.sh$'' + ''^src/nix-functional-tests/flakes/follow-paths\.sh$'' + ''^src/nix-functional-tests/flakes/prefetch\.sh$'' + ''^src/nix-functional-tests/flakes/run\.sh$'' + ''^src/nix-functional-tests/flakes/show\.sh$'' + ''^src/nix-functional-tests/fmt\.sh$'' + ''^src/nix-functional-tests/fmt\.simple\.sh$'' + ''^src/nix-functional-tests/gc-auto\.sh$'' + ''^src/nix-functional-tests/gc-concurrent\.builder\.sh$'' + ''^src/nix-functional-tests/gc-concurrent\.sh$'' + ''^src/nix-functional-tests/gc-concurrent2\.builder\.sh$'' + ''^src/nix-functional-tests/gc-non-blocking\.sh$'' + ''^src/nix-functional-tests/gc\.sh$'' + ''^src/nix-functional-tests/git-hashing/common\.sh$'' + ''^src/nix-functional-tests/git-hashing/simple\.sh$'' + ''^src/nix-functional-tests/hash-convert\.sh$'' + ''^src/nix-functional-tests/help\.sh$'' + ''^src/nix-functional-tests/impure-derivations\.sh$'' + ''^src/nix-functional-tests/impure-env\.sh$'' + ''^src/nix-functional-tests/impure-eval\.sh$'' + ''^src/nix-functional-tests/install-darwin\.sh$'' + ''^src/nix-functional-tests/lang\.sh$'' + ''^src/nix-functional-tests/legacy-ssh-store\.sh$'' + ''^src/nix-functional-tests/linux-sandbox\.sh$'' + ''^src/nix-functional-tests/local-overlay-store/add-lower-inner\.sh$'' + ''^src/nix-functional-tests/local-overlay-store/add-lower\.sh$'' + ''^src/nix-functional-tests/local-overlay-store/bad-uris\.sh$'' + ''^src/nix-functional-tests/local-overlay-store/build-inner\.sh$'' + ''^src/nix-functional-tests/local-overlay-store/build\.sh$'' + ''^src/nix-functional-tests/local-overlay-store/check-post-init-inner\.sh$'' + ''^src/nix-functional-tests/local-overlay-store/check-post-init\.sh$'' + ''^src/nix-functional-tests/local-overlay-store/common\.sh$'' + ''^src/nix-functional-tests/local-overlay-store/delete-duplicate-inner\.sh$'' + ''^src/nix-functional-tests/local-overlay-store/delete-duplicate\.sh$'' + ''^src/nix-functional-tests/local-overlay-store/delete-refs-inner\.sh$'' + ''^src/nix-functional-tests/local-overlay-store/delete-refs\.sh$'' + ''^src/nix-functional-tests/local-overlay-store/gc-inner\.sh$'' + ''^src/nix-functional-tests/local-overlay-store/gc\.sh$'' + ''^src/nix-functional-tests/local-overlay-store/optimise-inner\.sh$'' + ''^src/nix-functional-tests/local-overlay-store/optimise\.sh$'' + ''^src/nix-functional-tests/local-overlay-store/redundant-add-inner\.sh$'' + ''^src/nix-functional-tests/local-overlay-store/redundant-add\.sh$'' + ''^src/nix-functional-tests/local-overlay-store/remount\.sh$'' + ''^src/nix-functional-tests/local-overlay-store/stale-file-handle-inner\.sh$'' + ''^src/nix-functional-tests/local-overlay-store/stale-file-handle\.sh$'' + ''^src/nix-functional-tests/local-overlay-store/verify-inner\.sh$'' + ''^src/nix-functional-tests/local-overlay-store/verify\.sh$'' + ''^src/nix-functional-tests/logging\.sh$'' + ''^src/nix-functional-tests/misc\.sh$'' + ''^src/nix-functional-tests/multiple-outputs\.sh$'' + ''^src/nix-functional-tests/nar-access\.sh$'' + ''^src/nix-functional-tests/nested-sandboxing\.sh$'' + ''^src/nix-functional-tests/nested-sandboxing/command\.sh$'' + ''^src/nix-functional-tests/nix-build\.sh$'' + ''^src/nix-functional-tests/nix-channel\.sh$'' + ''^src/nix-functional-tests/nix-collect-garbage-d\.sh$'' + ''^src/nix-functional-tests/nix-copy-ssh-common\.sh$'' + ''^src/nix-functional-tests/nix-copy-ssh-ng\.sh$'' + ''^src/nix-functional-tests/nix-copy-ssh\.sh$'' + ''^src/nix-functional-tests/nix-daemon-untrusting\.sh$'' + ''^src/nix-functional-tests/nix-profile\.sh$'' + ''^src/nix-functional-tests/nix-shell\.sh$'' + ''^src/nix-functional-tests/nix_path\.sh$'' + ''^src/nix-functional-tests/optimise-store\.sh$'' + ''^src/nix-functional-tests/output-normalization\.sh$'' + ''^src/nix-functional-tests/parallel\.builder\.sh$'' + ''^src/nix-functional-tests/parallel\.sh$'' + ''^src/nix-functional-tests/pass-as-file\.sh$'' + ''^src/nix-functional-tests/path-from-hash-part\.sh$'' + ''^src/nix-functional-tests/path-info\.sh$'' + ''^src/nix-functional-tests/placeholders\.sh$'' + ''^src/nix-functional-tests/plugins\.sh$'' + ''^src/nix-functional-tests/post-hook\.sh$'' + ''^src/nix-functional-tests/pure-eval\.sh$'' + ''^src/nix-functional-tests/push-to-store-old\.sh$'' + ''^src/nix-functional-tests/push-to-store\.sh$'' + ''^src/nix-functional-tests/read-only-store\.sh$'' + ''^src/nix-functional-tests/readfile-context\.sh$'' + ''^src/nix-functional-tests/recursive\.sh$'' + ''^src/nix-functional-tests/referrers\.sh$'' + ''^src/nix-functional-tests/remote-store\.sh$'' + ''^src/nix-functional-tests/repair\.sh$'' + ''^src/nix-functional-tests/restricted\.sh$'' + ''^src/nix-functional-tests/search\.sh$'' + ''^src/nix-functional-tests/secure-drv-outputs\.sh$'' + ''^src/nix-functional-tests/selfref-gc\.sh$'' + ''^src/nix-functional-tests/shell\.sh$'' + ''^src/nix-functional-tests/shell\.shebang\.sh$'' + ''^src/nix-functional-tests/simple\.builder\.sh$'' + ''^src/nix-functional-tests/supplementary-groups\.sh$'' + ''^src/nix-functional-tests/toString-path\.sh$'' + ''^src/nix-functional-tests/user-envs-migration\.sh$'' + ''^src/nix-functional-tests/user-envs-test-case\.sh$'' + ''^src/nix-functional-tests/user-envs\.builder\.sh$'' + ''^src/nix-functional-tests/user-envs\.sh$'' + ''^src/nix-functional-tests/why-depends\.sh$'' + ''^src/nix-functional-tests/zstd\.sh$'' ''^src/nix-util-tests/data/git/check-data\.sh$'' ]; }; diff --git a/mk/common-test.sh b/mk/common-test.sh index 817422c402d..a4e7505bf33 100644 --- a/mk/common-test.sh +++ b/mk/common-test.sh @@ -5,7 +5,7 @@ test_name=$(echo -n "${test?must be defined by caller (test runner)}" | sed \ -e "s|^src/[^/]*-test/data/||" \ - -e "s|^tests/functional/||" \ + -e "s|^src/nix-functional-tests/||" \ -e "s|\.sh$||" \ ) diff --git a/package.nix b/package.nix index 00621d47539..0b0567ae452 100644 --- a/package.nix +++ b/package.nix @@ -177,7 +177,7 @@ in { ] ++ lib.optionals enableManual [ ./doc/manual ] ++ lib.optionals doInstallCheck [ - ./tests/functional + ./src/nix-functional-tests ])); }; diff --git a/src/libstore/gc.cc b/src/libstore/gc.cc index 73195794a5c..d06c729bab8 100644 --- a/src/libstore/gc.cc +++ b/src/libstore/gc.cc @@ -623,7 +623,7 @@ void LocalStore::collectGarbage(const GCOptions & options, GCResults & results) roots.insert(root.first); } - /* Synchronisation point for testing, see tests/functional/gc-non-blocking.sh. */ + /* Synchronisation point for testing, see src/nix-functional-tests/gc-non-blocking.sh. */ if (auto p = getEnv("_NIX_TEST_GC_SYNC_2")) readFile(*p); diff --git a/src/libutil/error.cc b/src/libutil/error.cc index ccd008c7c33..1777858390f 100644 --- a/src/libutil/error.cc +++ b/src/libutil/error.cc @@ -214,7 +214,7 @@ void printSkippedTracesMaybe( // - 1 entry of A // - (9 duplicate frames omitted) // - // See: `tests/functional/lang/eval-fail-mutual-recursion.nix` + // See: `src/nix-functional-tests/lang/eval-fail-mutual-recursion.nix` tracesSeen.clear(); } } diff --git a/src/libutil/url-parts.hh b/src/libutil/url-parts.hh index 1ddc6a53649..2dee7fc5738 100644 --- a/src/libutil/url-parts.hh +++ b/src/libutil/url-parts.hh @@ -32,7 +32,7 @@ extern std::regex refRegex; /// Instead of defining what a good Git Ref is, we define what a bad Git Ref is /// This is because of the definition of a ref in refs.c in https://github.com/git/git -/// See tests/functional/fetchGitRefs.sh for the full definition +/// See src/nix-functional-tests/fetchGitRefs.sh for the full definition const static std::string badGitRefRegexS = "//|^[./]|/\\.|\\.\\.|[[:cntrl:][:space:]:?^~\[]|\\\\|\\*|\\.lock$|\\.lock/|@\\{|[/.]$|^@$|^$"; extern std::regex badGitRefRegex; diff --git a/src/nix-functional-tests b/src/nix-functional-tests deleted file mode 120000 index ed0cdf60bf9..00000000000 --- a/src/nix-functional-tests +++ /dev/null @@ -1 +0,0 @@ -../tests/functional \ No newline at end of file diff --git a/tests/functional/.version b/src/nix-functional-tests/.version similarity index 100% rename from tests/functional/.version rename to src/nix-functional-tests/.version diff --git a/tests/functional/add.sh b/src/nix-functional-tests/add.sh similarity index 100% rename from tests/functional/add.sh rename to src/nix-functional-tests/add.sh diff --git a/tests/functional/bash-profile.sh b/src/nix-functional-tests/bash-profile.sh similarity index 100% rename from tests/functional/bash-profile.sh rename to src/nix-functional-tests/bash-profile.sh diff --git a/tests/functional/big-derivation-attr.nix b/src/nix-functional-tests/big-derivation-attr.nix similarity index 100% rename from tests/functional/big-derivation-attr.nix rename to src/nix-functional-tests/big-derivation-attr.nix diff --git a/tests/functional/binary-cache-build-remote.sh b/src/nix-functional-tests/binary-cache-build-remote.sh similarity index 100% rename from tests/functional/binary-cache-build-remote.sh rename to src/nix-functional-tests/binary-cache-build-remote.sh diff --git a/tests/functional/binary-cache.sh b/src/nix-functional-tests/binary-cache.sh similarity index 100% rename from tests/functional/binary-cache.sh rename to src/nix-functional-tests/binary-cache.sh diff --git a/tests/functional/brotli.sh b/src/nix-functional-tests/brotli.sh similarity index 100% rename from tests/functional/brotli.sh rename to src/nix-functional-tests/brotli.sh diff --git a/tests/functional/build-delete.sh b/src/nix-functional-tests/build-delete.sh similarity index 100% rename from tests/functional/build-delete.sh rename to src/nix-functional-tests/build-delete.sh diff --git a/tests/functional/build-dry.sh b/src/nix-functional-tests/build-dry.sh similarity index 100% rename from tests/functional/build-dry.sh rename to src/nix-functional-tests/build-dry.sh diff --git a/tests/functional/build-hook-ca-fixed.nix b/src/nix-functional-tests/build-hook-ca-fixed.nix similarity index 100% rename from tests/functional/build-hook-ca-fixed.nix rename to src/nix-functional-tests/build-hook-ca-fixed.nix diff --git a/tests/functional/build-hook-ca-floating.nix b/src/nix-functional-tests/build-hook-ca-floating.nix similarity index 100% rename from tests/functional/build-hook-ca-floating.nix rename to src/nix-functional-tests/build-hook-ca-floating.nix diff --git a/tests/functional/build-hook.nix b/src/nix-functional-tests/build-hook.nix similarity index 100% rename from tests/functional/build-hook.nix rename to src/nix-functional-tests/build-hook.nix diff --git a/tests/functional/build-remote-content-addressed-fixed.sh b/src/nix-functional-tests/build-remote-content-addressed-fixed.sh similarity index 100% rename from tests/functional/build-remote-content-addressed-fixed.sh rename to src/nix-functional-tests/build-remote-content-addressed-fixed.sh diff --git a/tests/functional/build-remote-content-addressed-floating.sh b/src/nix-functional-tests/build-remote-content-addressed-floating.sh similarity index 100% rename from tests/functional/build-remote-content-addressed-floating.sh rename to src/nix-functional-tests/build-remote-content-addressed-floating.sh diff --git a/tests/functional/build-remote-input-addressed.sh b/src/nix-functional-tests/build-remote-input-addressed.sh similarity index 100% rename from tests/functional/build-remote-input-addressed.sh rename to src/nix-functional-tests/build-remote-input-addressed.sh diff --git a/tests/functional/build-remote-trustless-after.sh b/src/nix-functional-tests/build-remote-trustless-after.sh similarity index 100% rename from tests/functional/build-remote-trustless-after.sh rename to src/nix-functional-tests/build-remote-trustless-after.sh diff --git a/tests/functional/build-remote-trustless-should-fail-0.sh b/src/nix-functional-tests/build-remote-trustless-should-fail-0.sh similarity index 100% rename from tests/functional/build-remote-trustless-should-fail-0.sh rename to src/nix-functional-tests/build-remote-trustless-should-fail-0.sh diff --git a/tests/functional/build-remote-trustless-should-pass-0.sh b/src/nix-functional-tests/build-remote-trustless-should-pass-0.sh similarity index 100% rename from tests/functional/build-remote-trustless-should-pass-0.sh rename to src/nix-functional-tests/build-remote-trustless-should-pass-0.sh diff --git a/tests/functional/build-remote-trustless-should-pass-1.sh b/src/nix-functional-tests/build-remote-trustless-should-pass-1.sh similarity index 100% rename from tests/functional/build-remote-trustless-should-pass-1.sh rename to src/nix-functional-tests/build-remote-trustless-should-pass-1.sh diff --git a/tests/functional/build-remote-trustless-should-pass-2.sh b/src/nix-functional-tests/build-remote-trustless-should-pass-2.sh similarity index 100% rename from tests/functional/build-remote-trustless-should-pass-2.sh rename to src/nix-functional-tests/build-remote-trustless-should-pass-2.sh diff --git a/tests/functional/build-remote-trustless-should-pass-3.sh b/src/nix-functional-tests/build-remote-trustless-should-pass-3.sh similarity index 100% rename from tests/functional/build-remote-trustless-should-pass-3.sh rename to src/nix-functional-tests/build-remote-trustless-should-pass-3.sh diff --git a/tests/functional/build-remote-trustless.sh b/src/nix-functional-tests/build-remote-trustless.sh similarity index 86% rename from tests/functional/build-remote-trustless.sh rename to src/nix-functional-tests/build-remote-trustless.sh index c498d46c301..20b59c4dc19 100644 --- a/tests/functional/build-remote-trustless.sh +++ b/src/nix-functional-tests/build-remote-trustless.sh @@ -12,7 +12,7 @@ unset NIX_STATE_DIR remoteDir=$TEST_ROOT/remote -# Note: ssh{-ng}://localhost bypasses ssh. See tests/functional/build-remote.sh for +# Note: ssh{-ng}://localhost bypasses ssh. See src/nix-functional-tests/build-remote.sh for # more details. nix-build "$file" -o "$TEST_ROOT/result" --max-jobs 0 \ --arg busybox "$busybox" \ diff --git a/tests/functional/build-remote-with-mounted-ssh-ng.sh b/src/nix-functional-tests/build-remote-with-mounted-ssh-ng.sh similarity index 100% rename from tests/functional/build-remote-with-mounted-ssh-ng.sh rename to src/nix-functional-tests/build-remote-with-mounted-ssh-ng.sh diff --git a/tests/functional/build-remote.sh b/src/nix-functional-tests/build-remote.sh similarity index 100% rename from tests/functional/build-remote.sh rename to src/nix-functional-tests/build-remote.sh diff --git a/tests/functional/build.sh b/src/nix-functional-tests/build.sh similarity index 100% rename from tests/functional/build.sh rename to src/nix-functional-tests/build.sh diff --git a/tests/functional/ca-shell.nix b/src/nix-functional-tests/ca-shell.nix similarity index 100% rename from tests/functional/ca-shell.nix rename to src/nix-functional-tests/ca-shell.nix diff --git a/tests/functional/ca/build-cache.sh b/src/nix-functional-tests/ca/build-cache.sh similarity index 100% rename from tests/functional/ca/build-cache.sh rename to src/nix-functional-tests/ca/build-cache.sh diff --git a/tests/functional/ca/build-dry.sh b/src/nix-functional-tests/ca/build-dry.sh similarity index 100% rename from tests/functional/ca/build-dry.sh rename to src/nix-functional-tests/ca/build-dry.sh diff --git a/tests/functional/ca/build-with-garbage-path.sh b/src/nix-functional-tests/ca/build-with-garbage-path.sh similarity index 100% rename from tests/functional/ca/build-with-garbage-path.sh rename to src/nix-functional-tests/ca/build-with-garbage-path.sh diff --git a/tests/functional/ca/build.sh b/src/nix-functional-tests/ca/build.sh similarity index 100% rename from tests/functional/ca/build.sh rename to src/nix-functional-tests/ca/build.sh diff --git a/tests/functional/ca/common.sh b/src/nix-functional-tests/ca/common.sh similarity index 100% rename from tests/functional/ca/common.sh rename to src/nix-functional-tests/ca/common.sh diff --git a/tests/functional/ca/concurrent-builds.sh b/src/nix-functional-tests/ca/concurrent-builds.sh similarity index 100% rename from tests/functional/ca/concurrent-builds.sh rename to src/nix-functional-tests/ca/concurrent-builds.sh diff --git a/tests/functional/ca/config.nix.in b/src/nix-functional-tests/ca/config.nix.in similarity index 100% rename from tests/functional/ca/config.nix.in rename to src/nix-functional-tests/ca/config.nix.in diff --git a/tests/functional/ca/content-addressed.nix b/src/nix-functional-tests/ca/content-addressed.nix similarity index 100% rename from tests/functional/ca/content-addressed.nix rename to src/nix-functional-tests/ca/content-addressed.nix diff --git a/tests/functional/ca/derivation-json.sh b/src/nix-functional-tests/ca/derivation-json.sh similarity index 100% rename from tests/functional/ca/derivation-json.sh rename to src/nix-functional-tests/ca/derivation-json.sh diff --git a/tests/functional/ca/duplicate-realisation-in-closure.sh b/src/nix-functional-tests/ca/duplicate-realisation-in-closure.sh similarity index 100% rename from tests/functional/ca/duplicate-realisation-in-closure.sh rename to src/nix-functional-tests/ca/duplicate-realisation-in-closure.sh diff --git a/tests/functional/ca/eval-store.sh b/src/nix-functional-tests/ca/eval-store.sh similarity index 100% rename from tests/functional/ca/eval-store.sh rename to src/nix-functional-tests/ca/eval-store.sh diff --git a/tests/functional/ca/flake.nix b/src/nix-functional-tests/ca/flake.nix similarity index 100% rename from tests/functional/ca/flake.nix rename to src/nix-functional-tests/ca/flake.nix diff --git a/tests/functional/ca/gc.sh b/src/nix-functional-tests/ca/gc.sh similarity index 100% rename from tests/functional/ca/gc.sh rename to src/nix-functional-tests/ca/gc.sh diff --git a/tests/functional/ca/import-from-derivation.sh b/src/nix-functional-tests/ca/import-from-derivation.sh similarity index 100% rename from tests/functional/ca/import-from-derivation.sh rename to src/nix-functional-tests/ca/import-from-derivation.sh diff --git a/tests/functional/ca/local.mk b/src/nix-functional-tests/ca/local.mk similarity index 93% rename from tests/functional/ca/local.mk rename to src/nix-functional-tests/ca/local.mk index 7c2fcc451ac..7a668e6d70c 100644 --- a/tests/functional/ca/local.mk +++ b/src/nix-functional-tests/ca/local.mk @@ -26,4 +26,4 @@ clean-files += \ $(d)/config.nix test-deps += \ - tests/functional/ca/config.nix + src/nix-functional-tests/ca/config.nix diff --git a/tests/functional/ca/meson.build b/src/nix-functional-tests/ca/meson.build similarity index 100% rename from tests/functional/ca/meson.build rename to src/nix-functional-tests/ca/meson.build diff --git a/tests/functional/ca/new-build-cmd.sh b/src/nix-functional-tests/ca/new-build-cmd.sh similarity index 100% rename from tests/functional/ca/new-build-cmd.sh rename to src/nix-functional-tests/ca/new-build-cmd.sh diff --git a/tests/functional/ca/nix-copy.sh b/src/nix-functional-tests/ca/nix-copy.sh similarity index 100% rename from tests/functional/ca/nix-copy.sh rename to src/nix-functional-tests/ca/nix-copy.sh diff --git a/tests/functional/ca/nix-run.sh b/src/nix-functional-tests/ca/nix-run.sh similarity index 100% rename from tests/functional/ca/nix-run.sh rename to src/nix-functional-tests/ca/nix-run.sh diff --git a/tests/functional/ca/nix-shell.sh b/src/nix-functional-tests/ca/nix-shell.sh similarity index 100% rename from tests/functional/ca/nix-shell.sh rename to src/nix-functional-tests/ca/nix-shell.sh diff --git a/tests/functional/ca/nondeterministic.nix b/src/nix-functional-tests/ca/nondeterministic.nix similarity index 100% rename from tests/functional/ca/nondeterministic.nix rename to src/nix-functional-tests/ca/nondeterministic.nix diff --git a/tests/functional/ca/post-hook.sh b/src/nix-functional-tests/ca/post-hook.sh similarity index 100% rename from tests/functional/ca/post-hook.sh rename to src/nix-functional-tests/ca/post-hook.sh diff --git a/tests/functional/ca/racy.nix b/src/nix-functional-tests/ca/racy.nix similarity index 100% rename from tests/functional/ca/racy.nix rename to src/nix-functional-tests/ca/racy.nix diff --git a/tests/functional/ca/recursive.sh b/src/nix-functional-tests/ca/recursive.sh similarity index 100% rename from tests/functional/ca/recursive.sh rename to src/nix-functional-tests/ca/recursive.sh diff --git a/tests/functional/ca/repl.sh b/src/nix-functional-tests/ca/repl.sh similarity index 100% rename from tests/functional/ca/repl.sh rename to src/nix-functional-tests/ca/repl.sh diff --git a/tests/functional/ca/selfref-gc.sh b/src/nix-functional-tests/ca/selfref-gc.sh similarity index 100% rename from tests/functional/ca/selfref-gc.sh rename to src/nix-functional-tests/ca/selfref-gc.sh diff --git a/tests/functional/ca/signatures.sh b/src/nix-functional-tests/ca/signatures.sh similarity index 100% rename from tests/functional/ca/signatures.sh rename to src/nix-functional-tests/ca/signatures.sh diff --git a/tests/functional/ca/substitute.sh b/src/nix-functional-tests/ca/substitute.sh similarity index 100% rename from tests/functional/ca/substitute.sh rename to src/nix-functional-tests/ca/substitute.sh diff --git a/tests/functional/ca/why-depends.sh b/src/nix-functional-tests/ca/why-depends.sh similarity index 100% rename from tests/functional/ca/why-depends.sh rename to src/nix-functional-tests/ca/why-depends.sh diff --git a/tests/functional/case-collision.nar b/src/nix-functional-tests/case-collision.nar similarity index 100% rename from tests/functional/case-collision.nar rename to src/nix-functional-tests/case-collision.nar diff --git a/tests/functional/case.nar b/src/nix-functional-tests/case.nar similarity index 100% rename from tests/functional/case.nar rename to src/nix-functional-tests/case.nar diff --git a/tests/functional/characterisation-test-infra.sh b/src/nix-functional-tests/characterisation-test-infra.sh similarity index 100% rename from tests/functional/characterisation-test-infra.sh rename to src/nix-functional-tests/characterisation-test-infra.sh diff --git a/tests/functional/characterisation/empty b/src/nix-functional-tests/characterisation/empty similarity index 100% rename from tests/functional/characterisation/empty rename to src/nix-functional-tests/characterisation/empty diff --git a/tests/functional/characterisation/framework.sh b/src/nix-functional-tests/characterisation/framework.sh similarity index 96% rename from tests/functional/characterisation/framework.sh rename to src/nix-functional-tests/characterisation/framework.sh index 5ca125ab5bc..94ce8ea450c 100644 --- a/tests/functional/characterisation/framework.sh +++ b/src/nix-functional-tests/characterisation/framework.sh @@ -63,7 +63,7 @@ function characterisationTestExit() { echo '' echo 'You can rerun this test with:' echo '' - echo " _NIX_TEST_ACCEPT=1 make tests/functional/${TEST_NAME}.sh.test" + echo " _NIX_TEST_ACCEPT=1 make src/nix-functional-tests/${TEST_NAME}.sh.test" echo '' echo 'to regenerate the files containing the expected output,' echo 'and then view the git diff to decide whether a change is' diff --git a/tests/functional/check-refs.nix b/src/nix-functional-tests/check-refs.nix similarity index 100% rename from tests/functional/check-refs.nix rename to src/nix-functional-tests/check-refs.nix diff --git a/tests/functional/check-refs.sh b/src/nix-functional-tests/check-refs.sh similarity index 100% rename from tests/functional/check-refs.sh rename to src/nix-functional-tests/check-refs.sh diff --git a/tests/functional/check-reqs.nix b/src/nix-functional-tests/check-reqs.nix similarity index 100% rename from tests/functional/check-reqs.nix rename to src/nix-functional-tests/check-reqs.nix diff --git a/tests/functional/check-reqs.sh b/src/nix-functional-tests/check-reqs.sh similarity index 100% rename from tests/functional/check-reqs.sh rename to src/nix-functional-tests/check-reqs.sh diff --git a/tests/functional/check.nix b/src/nix-functional-tests/check.nix similarity index 100% rename from tests/functional/check.nix rename to src/nix-functional-tests/check.nix diff --git a/tests/functional/check.sh b/src/nix-functional-tests/check.sh similarity index 100% rename from tests/functional/check.sh rename to src/nix-functional-tests/check.sh diff --git a/tests/functional/chroot-store.sh b/src/nix-functional-tests/chroot-store.sh similarity index 100% rename from tests/functional/chroot-store.sh rename to src/nix-functional-tests/chroot-store.sh diff --git a/tests/functional/common.sh b/src/nix-functional-tests/common.sh similarity index 100% rename from tests/functional/common.sh rename to src/nix-functional-tests/common.sh diff --git a/tests/functional/common/functions.sh b/src/nix-functional-tests/common/functions.sh similarity index 100% rename from tests/functional/common/functions.sh rename to src/nix-functional-tests/common/functions.sh diff --git a/tests/functional/common/init.sh b/src/nix-functional-tests/common/init.sh similarity index 100% rename from tests/functional/common/init.sh rename to src/nix-functional-tests/common/init.sh diff --git a/tests/functional/common/meson.build b/src/nix-functional-tests/common/meson.build similarity index 100% rename from tests/functional/common/meson.build rename to src/nix-functional-tests/common/meson.build diff --git a/tests/functional/common/paths.sh b/src/nix-functional-tests/common/paths.sh similarity index 100% rename from tests/functional/common/paths.sh rename to src/nix-functional-tests/common/paths.sh diff --git a/tests/functional/common/subst-vars.sh.in b/src/nix-functional-tests/common/subst-vars.sh.in similarity index 100% rename from tests/functional/common/subst-vars.sh.in rename to src/nix-functional-tests/common/subst-vars.sh.in diff --git a/tests/functional/common/test-root.sh b/src/nix-functional-tests/common/test-root.sh similarity index 100% rename from tests/functional/common/test-root.sh rename to src/nix-functional-tests/common/test-root.sh diff --git a/tests/functional/common/vars.sh b/src/nix-functional-tests/common/vars.sh similarity index 100% rename from tests/functional/common/vars.sh rename to src/nix-functional-tests/common/vars.sh diff --git a/tests/functional/completions.sh b/src/nix-functional-tests/completions.sh similarity index 100% rename from tests/functional/completions.sh rename to src/nix-functional-tests/completions.sh diff --git a/tests/functional/compression-levels.sh b/src/nix-functional-tests/compression-levels.sh similarity index 100% rename from tests/functional/compression-levels.sh rename to src/nix-functional-tests/compression-levels.sh diff --git a/tests/functional/compute-levels.sh b/src/nix-functional-tests/compute-levels.sh similarity index 100% rename from tests/functional/compute-levels.sh rename to src/nix-functional-tests/compute-levels.sh diff --git a/tests/functional/config.nix.in b/src/nix-functional-tests/config.nix.in similarity index 100% rename from tests/functional/config.nix.in rename to src/nix-functional-tests/config.nix.in diff --git a/tests/functional/config.sh b/src/nix-functional-tests/config.sh similarity index 100% rename from tests/functional/config.sh rename to src/nix-functional-tests/config.sh diff --git a/tests/functional/config/extra-config.conf b/src/nix-functional-tests/config/extra-config.conf similarity index 100% rename from tests/functional/config/extra-config.conf rename to src/nix-functional-tests/config/extra-config.conf diff --git a/tests/functional/config/nix-with-bang-include.conf b/src/nix-functional-tests/config/nix-with-bang-include.conf similarity index 100% rename from tests/functional/config/nix-with-bang-include.conf rename to src/nix-functional-tests/config/nix-with-bang-include.conf diff --git a/tests/functional/config/nix-with-include.conf b/src/nix-functional-tests/config/nix-with-include.conf similarity index 100% rename from tests/functional/config/nix-with-include.conf rename to src/nix-functional-tests/config/nix-with-include.conf diff --git a/tests/functional/config/nix-with-substituters.conf b/src/nix-functional-tests/config/nix-with-substituters.conf similarity index 100% rename from tests/functional/config/nix-with-substituters.conf rename to src/nix-functional-tests/config/nix-with-substituters.conf diff --git a/tests/functional/db-migration.sh b/src/nix-functional-tests/db-migration.sh similarity index 100% rename from tests/functional/db-migration.sh rename to src/nix-functional-tests/db-migration.sh diff --git a/tests/functional/debugger.sh b/src/nix-functional-tests/debugger.sh similarity index 100% rename from tests/functional/debugger.sh rename to src/nix-functional-tests/debugger.sh diff --git a/tests/functional/dependencies.builder0.sh b/src/nix-functional-tests/dependencies.builder0.sh similarity index 100% rename from tests/functional/dependencies.builder0.sh rename to src/nix-functional-tests/dependencies.builder0.sh diff --git a/tests/functional/dependencies.nix b/src/nix-functional-tests/dependencies.nix similarity index 100% rename from tests/functional/dependencies.nix rename to src/nix-functional-tests/dependencies.nix diff --git a/tests/functional/dependencies.sh b/src/nix-functional-tests/dependencies.sh similarity index 100% rename from tests/functional/dependencies.sh rename to src/nix-functional-tests/dependencies.sh diff --git a/tests/functional/derivation-advanced-attributes.sh b/src/nix-functional-tests/derivation-advanced-attributes.sh similarity index 100% rename from tests/functional/derivation-advanced-attributes.sh rename to src/nix-functional-tests/derivation-advanced-attributes.sh diff --git a/tests/functional/derivation-json.sh b/src/nix-functional-tests/derivation-json.sh similarity index 100% rename from tests/functional/derivation-json.sh rename to src/nix-functional-tests/derivation-json.sh diff --git a/tests/functional/derivation/advanced-attributes-defaults.drv b/src/nix-functional-tests/derivation/advanced-attributes-defaults.drv similarity index 100% rename from tests/functional/derivation/advanced-attributes-defaults.drv rename to src/nix-functional-tests/derivation/advanced-attributes-defaults.drv diff --git a/tests/functional/derivation/advanced-attributes-defaults.nix b/src/nix-functional-tests/derivation/advanced-attributes-defaults.nix similarity index 100% rename from tests/functional/derivation/advanced-attributes-defaults.nix rename to src/nix-functional-tests/derivation/advanced-attributes-defaults.nix diff --git a/tests/functional/derivation/advanced-attributes-structured-attrs-defaults.drv b/src/nix-functional-tests/derivation/advanced-attributes-structured-attrs-defaults.drv similarity index 100% rename from tests/functional/derivation/advanced-attributes-structured-attrs-defaults.drv rename to src/nix-functional-tests/derivation/advanced-attributes-structured-attrs-defaults.drv diff --git a/tests/functional/derivation/advanced-attributes-structured-attrs-defaults.nix b/src/nix-functional-tests/derivation/advanced-attributes-structured-attrs-defaults.nix similarity index 100% rename from tests/functional/derivation/advanced-attributes-structured-attrs-defaults.nix rename to src/nix-functional-tests/derivation/advanced-attributes-structured-attrs-defaults.nix diff --git a/tests/functional/derivation/advanced-attributes-structured-attrs.drv b/src/nix-functional-tests/derivation/advanced-attributes-structured-attrs.drv similarity index 100% rename from tests/functional/derivation/advanced-attributes-structured-attrs.drv rename to src/nix-functional-tests/derivation/advanced-attributes-structured-attrs.drv diff --git a/tests/functional/derivation/advanced-attributes-structured-attrs.nix b/src/nix-functional-tests/derivation/advanced-attributes-structured-attrs.nix similarity index 100% rename from tests/functional/derivation/advanced-attributes-structured-attrs.nix rename to src/nix-functional-tests/derivation/advanced-attributes-structured-attrs.nix diff --git a/tests/functional/derivation/advanced-attributes.drv b/src/nix-functional-tests/derivation/advanced-attributes.drv similarity index 100% rename from tests/functional/derivation/advanced-attributes.drv rename to src/nix-functional-tests/derivation/advanced-attributes.drv diff --git a/tests/functional/derivation/advanced-attributes.nix b/src/nix-functional-tests/derivation/advanced-attributes.nix similarity index 100% rename from tests/functional/derivation/advanced-attributes.nix rename to src/nix-functional-tests/derivation/advanced-attributes.nix diff --git a/tests/functional/dot.nar b/src/nix-functional-tests/dot.nar similarity index 100% rename from tests/functional/dot.nar rename to src/nix-functional-tests/dot.nar diff --git a/tests/functional/dotdot.nar b/src/nix-functional-tests/dotdot.nar similarity index 100% rename from tests/functional/dotdot.nar rename to src/nix-functional-tests/dotdot.nar diff --git a/tests/functional/dummy b/src/nix-functional-tests/dummy similarity index 100% rename from tests/functional/dummy rename to src/nix-functional-tests/dummy diff --git a/tests/functional/dump-db.sh b/src/nix-functional-tests/dump-db.sh similarity index 100% rename from tests/functional/dump-db.sh rename to src/nix-functional-tests/dump-db.sh diff --git a/tests/functional/duplicate.nar b/src/nix-functional-tests/duplicate.nar similarity index 100% rename from tests/functional/duplicate.nar rename to src/nix-functional-tests/duplicate.nar diff --git a/tests/functional/dyn-drv/build-built-drv.sh b/src/nix-functional-tests/dyn-drv/build-built-drv.sh similarity index 100% rename from tests/functional/dyn-drv/build-built-drv.sh rename to src/nix-functional-tests/dyn-drv/build-built-drv.sh diff --git a/tests/functional/dyn-drv/common.sh b/src/nix-functional-tests/dyn-drv/common.sh similarity index 100% rename from tests/functional/dyn-drv/common.sh rename to src/nix-functional-tests/dyn-drv/common.sh diff --git a/tests/functional/dyn-drv/config.nix.in b/src/nix-functional-tests/dyn-drv/config.nix.in similarity index 100% rename from tests/functional/dyn-drv/config.nix.in rename to src/nix-functional-tests/dyn-drv/config.nix.in diff --git a/tests/functional/dyn-drv/dep-built-drv.sh b/src/nix-functional-tests/dyn-drv/dep-built-drv.sh similarity index 100% rename from tests/functional/dyn-drv/dep-built-drv.sh rename to src/nix-functional-tests/dyn-drv/dep-built-drv.sh diff --git a/tests/functional/dyn-drv/eval-outputOf.sh b/src/nix-functional-tests/dyn-drv/eval-outputOf.sh similarity index 100% rename from tests/functional/dyn-drv/eval-outputOf.sh rename to src/nix-functional-tests/dyn-drv/eval-outputOf.sh diff --git a/tests/functional/dyn-drv/local.mk b/src/nix-functional-tests/dyn-drv/local.mk similarity index 85% rename from tests/functional/dyn-drv/local.mk rename to src/nix-functional-tests/dyn-drv/local.mk index c87534944b1..5b3e0ac60ec 100644 --- a/tests/functional/dyn-drv/local.mk +++ b/src/nix-functional-tests/dyn-drv/local.mk @@ -12,4 +12,4 @@ clean-files += \ $(d)/config.nix test-deps += \ - tests/functional/dyn-drv/config.nix + src/nix-functional-tests/dyn-drv/config.nix diff --git a/tests/functional/dyn-drv/meson.build b/src/nix-functional-tests/dyn-drv/meson.build similarity index 100% rename from tests/functional/dyn-drv/meson.build rename to src/nix-functional-tests/dyn-drv/meson.build diff --git a/tests/functional/dyn-drv/old-daemon-error-hack.nix b/src/nix-functional-tests/dyn-drv/old-daemon-error-hack.nix similarity index 100% rename from tests/functional/dyn-drv/old-daemon-error-hack.nix rename to src/nix-functional-tests/dyn-drv/old-daemon-error-hack.nix diff --git a/tests/functional/dyn-drv/old-daemon-error-hack.sh b/src/nix-functional-tests/dyn-drv/old-daemon-error-hack.sh similarity index 100% rename from tests/functional/dyn-drv/old-daemon-error-hack.sh rename to src/nix-functional-tests/dyn-drv/old-daemon-error-hack.sh diff --git a/tests/functional/dyn-drv/recursive-mod-json.nix b/src/nix-functional-tests/dyn-drv/recursive-mod-json.nix similarity index 100% rename from tests/functional/dyn-drv/recursive-mod-json.nix rename to src/nix-functional-tests/dyn-drv/recursive-mod-json.nix diff --git a/tests/functional/dyn-drv/recursive-mod-json.sh b/src/nix-functional-tests/dyn-drv/recursive-mod-json.sh similarity index 100% rename from tests/functional/dyn-drv/recursive-mod-json.sh rename to src/nix-functional-tests/dyn-drv/recursive-mod-json.sh diff --git a/tests/functional/dyn-drv/text-hashed-output.nix b/src/nix-functional-tests/dyn-drv/text-hashed-output.nix similarity index 100% rename from tests/functional/dyn-drv/text-hashed-output.nix rename to src/nix-functional-tests/dyn-drv/text-hashed-output.nix diff --git a/tests/functional/dyn-drv/text-hashed-output.sh b/src/nix-functional-tests/dyn-drv/text-hashed-output.sh similarity index 100% rename from tests/functional/dyn-drv/text-hashed-output.sh rename to src/nix-functional-tests/dyn-drv/text-hashed-output.sh diff --git a/tests/functional/empty.nar b/src/nix-functional-tests/empty.nar similarity index 100% rename from tests/functional/empty.nar rename to src/nix-functional-tests/empty.nar diff --git a/tests/functional/eval-store.sh b/src/nix-functional-tests/eval-store.sh similarity index 100% rename from tests/functional/eval-store.sh rename to src/nix-functional-tests/eval-store.sh diff --git a/tests/functional/eval.nix b/src/nix-functional-tests/eval.nix similarity index 100% rename from tests/functional/eval.nix rename to src/nix-functional-tests/eval.nix diff --git a/tests/functional/eval.sh b/src/nix-functional-tests/eval.sh similarity index 100% rename from tests/functional/eval.sh rename to src/nix-functional-tests/eval.sh diff --git a/tests/functional/executable-after-contents.nar b/src/nix-functional-tests/executable-after-contents.nar similarity index 100% rename from tests/functional/executable-after-contents.nar rename to src/nix-functional-tests/executable-after-contents.nar diff --git a/tests/functional/experimental-features.sh b/src/nix-functional-tests/experimental-features.sh similarity index 100% rename from tests/functional/experimental-features.sh rename to src/nix-functional-tests/experimental-features.sh diff --git a/tests/functional/export-graph.nix b/src/nix-functional-tests/export-graph.nix similarity index 100% rename from tests/functional/export-graph.nix rename to src/nix-functional-tests/export-graph.nix diff --git a/tests/functional/export-graph.sh b/src/nix-functional-tests/export-graph.sh similarity index 100% rename from tests/functional/export-graph.sh rename to src/nix-functional-tests/export-graph.sh diff --git a/tests/functional/export.sh b/src/nix-functional-tests/export.sh similarity index 100% rename from tests/functional/export.sh rename to src/nix-functional-tests/export.sh diff --git a/tests/functional/extra-sandbox-profile.nix b/src/nix-functional-tests/extra-sandbox-profile.nix similarity index 100% rename from tests/functional/extra-sandbox-profile.nix rename to src/nix-functional-tests/extra-sandbox-profile.nix diff --git a/tests/functional/extra-sandbox-profile.sh b/src/nix-functional-tests/extra-sandbox-profile.sh similarity index 100% rename from tests/functional/extra-sandbox-profile.sh rename to src/nix-functional-tests/extra-sandbox-profile.sh diff --git a/tests/functional/failing.nix b/src/nix-functional-tests/failing.nix similarity index 100% rename from tests/functional/failing.nix rename to src/nix-functional-tests/failing.nix diff --git a/tests/functional/fetchClosure.sh b/src/nix-functional-tests/fetchClosure.sh similarity index 100% rename from tests/functional/fetchClosure.sh rename to src/nix-functional-tests/fetchClosure.sh diff --git a/tests/functional/fetchGit.sh b/src/nix-functional-tests/fetchGit.sh similarity index 100% rename from tests/functional/fetchGit.sh rename to src/nix-functional-tests/fetchGit.sh diff --git a/tests/functional/fetchGitRefs.sh b/src/nix-functional-tests/fetchGitRefs.sh similarity index 100% rename from tests/functional/fetchGitRefs.sh rename to src/nix-functional-tests/fetchGitRefs.sh diff --git a/tests/functional/fetchGitSubmodules.sh b/src/nix-functional-tests/fetchGitSubmodules.sh similarity index 100% rename from tests/functional/fetchGitSubmodules.sh rename to src/nix-functional-tests/fetchGitSubmodules.sh diff --git a/tests/functional/fetchGitVerification.sh b/src/nix-functional-tests/fetchGitVerification.sh similarity index 100% rename from tests/functional/fetchGitVerification.sh rename to src/nix-functional-tests/fetchGitVerification.sh diff --git a/tests/functional/fetchMercurial.sh b/src/nix-functional-tests/fetchMercurial.sh similarity index 100% rename from tests/functional/fetchMercurial.sh rename to src/nix-functional-tests/fetchMercurial.sh diff --git a/tests/functional/fetchPath.sh b/src/nix-functional-tests/fetchPath.sh similarity index 100% rename from tests/functional/fetchPath.sh rename to src/nix-functional-tests/fetchPath.sh diff --git a/tests/functional/fetchTree-file.sh b/src/nix-functional-tests/fetchTree-file.sh similarity index 100% rename from tests/functional/fetchTree-file.sh rename to src/nix-functional-tests/fetchTree-file.sh diff --git a/tests/functional/fetchurl.sh b/src/nix-functional-tests/fetchurl.sh similarity index 100% rename from tests/functional/fetchurl.sh rename to src/nix-functional-tests/fetchurl.sh diff --git a/tests/functional/filter-source.nix b/src/nix-functional-tests/filter-source.nix similarity index 100% rename from tests/functional/filter-source.nix rename to src/nix-functional-tests/filter-source.nix diff --git a/tests/functional/filter-source.sh b/src/nix-functional-tests/filter-source.sh similarity index 100% rename from tests/functional/filter-source.sh rename to src/nix-functional-tests/filter-source.sh diff --git a/tests/functional/fixed.builder1.sh b/src/nix-functional-tests/fixed.builder1.sh similarity index 100% rename from tests/functional/fixed.builder1.sh rename to src/nix-functional-tests/fixed.builder1.sh diff --git a/tests/functional/fixed.builder2.sh b/src/nix-functional-tests/fixed.builder2.sh similarity index 100% rename from tests/functional/fixed.builder2.sh rename to src/nix-functional-tests/fixed.builder2.sh diff --git a/tests/functional/fixed.nix b/src/nix-functional-tests/fixed.nix similarity index 100% rename from tests/functional/fixed.nix rename to src/nix-functional-tests/fixed.nix diff --git a/tests/functional/fixed.sh b/src/nix-functional-tests/fixed.sh similarity index 100% rename from tests/functional/fixed.sh rename to src/nix-functional-tests/fixed.sh diff --git a/tests/functional/flakes/absolute-attr-paths.sh b/src/nix-functional-tests/flakes/absolute-attr-paths.sh similarity index 100% rename from tests/functional/flakes/absolute-attr-paths.sh rename to src/nix-functional-tests/flakes/absolute-attr-paths.sh diff --git a/tests/functional/flakes/absolute-paths.sh b/src/nix-functional-tests/flakes/absolute-paths.sh similarity index 100% rename from tests/functional/flakes/absolute-paths.sh rename to src/nix-functional-tests/flakes/absolute-paths.sh diff --git a/tests/functional/flakes/build-paths.sh b/src/nix-functional-tests/flakes/build-paths.sh similarity index 100% rename from tests/functional/flakes/build-paths.sh rename to src/nix-functional-tests/flakes/build-paths.sh diff --git a/tests/functional/flakes/bundle.sh b/src/nix-functional-tests/flakes/bundle.sh similarity index 100% rename from tests/functional/flakes/bundle.sh rename to src/nix-functional-tests/flakes/bundle.sh diff --git a/tests/functional/flakes/check.sh b/src/nix-functional-tests/flakes/check.sh similarity index 100% rename from tests/functional/flakes/check.sh rename to src/nix-functional-tests/flakes/check.sh diff --git a/tests/functional/flakes/circular.sh b/src/nix-functional-tests/flakes/circular.sh similarity index 100% rename from tests/functional/flakes/circular.sh rename to src/nix-functional-tests/flakes/circular.sh diff --git a/tests/functional/flakes/common.sh b/src/nix-functional-tests/flakes/common.sh similarity index 100% rename from tests/functional/flakes/common.sh rename to src/nix-functional-tests/flakes/common.sh diff --git a/tests/functional/flakes/config.sh b/src/nix-functional-tests/flakes/config.sh similarity index 100% rename from tests/functional/flakes/config.sh rename to src/nix-functional-tests/flakes/config.sh diff --git a/tests/functional/flakes/develop.sh b/src/nix-functional-tests/flakes/develop.sh similarity index 100% rename from tests/functional/flakes/develop.sh rename to src/nix-functional-tests/flakes/develop.sh diff --git a/tests/functional/flakes/dubious-query.sh b/src/nix-functional-tests/flakes/dubious-query.sh similarity index 100% rename from tests/functional/flakes/dubious-query.sh rename to src/nix-functional-tests/flakes/dubious-query.sh diff --git a/tests/functional/flakes/edit.sh b/src/nix-functional-tests/flakes/edit.sh similarity index 100% rename from tests/functional/flakes/edit.sh rename to src/nix-functional-tests/flakes/edit.sh diff --git a/tests/functional/flakes/eval-cache.sh b/src/nix-functional-tests/flakes/eval-cache.sh similarity index 100% rename from tests/functional/flakes/eval-cache.sh rename to src/nix-functional-tests/flakes/eval-cache.sh diff --git a/tests/functional/flakes/flake-in-submodule.sh b/src/nix-functional-tests/flakes/flake-in-submodule.sh similarity index 100% rename from tests/functional/flakes/flake-in-submodule.sh rename to src/nix-functional-tests/flakes/flake-in-submodule.sh diff --git a/tests/functional/flakes/flakes.sh b/src/nix-functional-tests/flakes/flakes.sh similarity index 100% rename from tests/functional/flakes/flakes.sh rename to src/nix-functional-tests/flakes/flakes.sh diff --git a/tests/functional/flakes/follow-paths.sh b/src/nix-functional-tests/flakes/follow-paths.sh similarity index 100% rename from tests/functional/flakes/follow-paths.sh rename to src/nix-functional-tests/flakes/follow-paths.sh diff --git a/tests/functional/flakes/init.sh b/src/nix-functional-tests/flakes/init.sh similarity index 100% rename from tests/functional/flakes/init.sh rename to src/nix-functional-tests/flakes/init.sh diff --git a/tests/functional/flakes/inputs.sh b/src/nix-functional-tests/flakes/inputs.sh similarity index 100% rename from tests/functional/flakes/inputs.sh rename to src/nix-functional-tests/flakes/inputs.sh diff --git a/tests/functional/flakes/local.mk b/src/nix-functional-tests/flakes/local.mk similarity index 100% rename from tests/functional/flakes/local.mk rename to src/nix-functional-tests/flakes/local.mk diff --git a/tests/functional/flakes/mercurial.sh b/src/nix-functional-tests/flakes/mercurial.sh similarity index 100% rename from tests/functional/flakes/mercurial.sh rename to src/nix-functional-tests/flakes/mercurial.sh diff --git a/tests/functional/flakes/meson.build b/src/nix-functional-tests/flakes/meson.build similarity index 100% rename from tests/functional/flakes/meson.build rename to src/nix-functional-tests/flakes/meson.build diff --git a/tests/functional/flakes/prefetch.sh b/src/nix-functional-tests/flakes/prefetch.sh similarity index 100% rename from tests/functional/flakes/prefetch.sh rename to src/nix-functional-tests/flakes/prefetch.sh diff --git a/tests/functional/flakes/run.sh b/src/nix-functional-tests/flakes/run.sh similarity index 100% rename from tests/functional/flakes/run.sh rename to src/nix-functional-tests/flakes/run.sh diff --git a/tests/functional/flakes/search-root.sh b/src/nix-functional-tests/flakes/search-root.sh similarity index 100% rename from tests/functional/flakes/search-root.sh rename to src/nix-functional-tests/flakes/search-root.sh diff --git a/tests/functional/flakes/show.sh b/src/nix-functional-tests/flakes/show.sh similarity index 100% rename from tests/functional/flakes/show.sh rename to src/nix-functional-tests/flakes/show.sh diff --git a/tests/functional/flakes/tree.zip b/src/nix-functional-tests/flakes/tree.zip similarity index 100% rename from tests/functional/flakes/tree.zip rename to src/nix-functional-tests/flakes/tree.zip diff --git a/tests/functional/flakes/unlocked-override.sh b/src/nix-functional-tests/flakes/unlocked-override.sh similarity index 100% rename from tests/functional/flakes/unlocked-override.sh rename to src/nix-functional-tests/flakes/unlocked-override.sh diff --git a/tests/functional/fmt.sh b/src/nix-functional-tests/fmt.sh similarity index 100% rename from tests/functional/fmt.sh rename to src/nix-functional-tests/fmt.sh diff --git a/tests/functional/fmt.simple.sh b/src/nix-functional-tests/fmt.simple.sh similarity index 100% rename from tests/functional/fmt.simple.sh rename to src/nix-functional-tests/fmt.simple.sh diff --git a/tests/functional/fod-failing.nix b/src/nix-functional-tests/fod-failing.nix similarity index 100% rename from tests/functional/fod-failing.nix rename to src/nix-functional-tests/fod-failing.nix diff --git a/tests/functional/function-trace.sh b/src/nix-functional-tests/function-trace.sh similarity index 100% rename from tests/functional/function-trace.sh rename to src/nix-functional-tests/function-trace.sh diff --git a/tests/functional/gc-auto.sh b/src/nix-functional-tests/gc-auto.sh similarity index 100% rename from tests/functional/gc-auto.sh rename to src/nix-functional-tests/gc-auto.sh diff --git a/tests/functional/gc-concurrent.builder.sh b/src/nix-functional-tests/gc-concurrent.builder.sh similarity index 100% rename from tests/functional/gc-concurrent.builder.sh rename to src/nix-functional-tests/gc-concurrent.builder.sh diff --git a/tests/functional/gc-concurrent.nix b/src/nix-functional-tests/gc-concurrent.nix similarity index 100% rename from tests/functional/gc-concurrent.nix rename to src/nix-functional-tests/gc-concurrent.nix diff --git a/tests/functional/gc-concurrent.sh b/src/nix-functional-tests/gc-concurrent.sh similarity index 100% rename from tests/functional/gc-concurrent.sh rename to src/nix-functional-tests/gc-concurrent.sh diff --git a/tests/functional/gc-concurrent2.builder.sh b/src/nix-functional-tests/gc-concurrent2.builder.sh similarity index 100% rename from tests/functional/gc-concurrent2.builder.sh rename to src/nix-functional-tests/gc-concurrent2.builder.sh diff --git a/tests/functional/gc-non-blocking.sh b/src/nix-functional-tests/gc-non-blocking.sh similarity index 100% rename from tests/functional/gc-non-blocking.sh rename to src/nix-functional-tests/gc-non-blocking.sh diff --git a/tests/functional/gc-runtime.nix b/src/nix-functional-tests/gc-runtime.nix similarity index 100% rename from tests/functional/gc-runtime.nix rename to src/nix-functional-tests/gc-runtime.nix diff --git a/tests/functional/gc-runtime.sh b/src/nix-functional-tests/gc-runtime.sh similarity index 100% rename from tests/functional/gc-runtime.sh rename to src/nix-functional-tests/gc-runtime.sh diff --git a/tests/functional/gc.sh b/src/nix-functional-tests/gc.sh similarity index 100% rename from tests/functional/gc.sh rename to src/nix-functional-tests/gc.sh diff --git a/tests/functional/git-hashing/common.sh b/src/nix-functional-tests/git-hashing/common.sh similarity index 100% rename from tests/functional/git-hashing/common.sh rename to src/nix-functional-tests/git-hashing/common.sh diff --git a/tests/functional/git-hashing/local.mk b/src/nix-functional-tests/git-hashing/local.mk similarity index 100% rename from tests/functional/git-hashing/local.mk rename to src/nix-functional-tests/git-hashing/local.mk diff --git a/tests/functional/git-hashing/meson.build b/src/nix-functional-tests/git-hashing/meson.build similarity index 100% rename from tests/functional/git-hashing/meson.build rename to src/nix-functional-tests/git-hashing/meson.build diff --git a/tests/functional/git-hashing/simple.sh b/src/nix-functional-tests/git-hashing/simple.sh similarity index 100% rename from tests/functional/git-hashing/simple.sh rename to src/nix-functional-tests/git-hashing/simple.sh diff --git a/tests/functional/hash-check.nix b/src/nix-functional-tests/hash-check.nix similarity index 100% rename from tests/functional/hash-check.nix rename to src/nix-functional-tests/hash-check.nix diff --git a/tests/functional/hash-convert.sh b/src/nix-functional-tests/hash-convert.sh similarity index 100% rename from tests/functional/hash-convert.sh rename to src/nix-functional-tests/hash-convert.sh diff --git a/tests/functional/hash-path.sh b/src/nix-functional-tests/hash-path.sh similarity index 100% rename from tests/functional/hash-path.sh rename to src/nix-functional-tests/hash-path.sh diff --git a/tests/functional/help.sh b/src/nix-functional-tests/help.sh similarity index 100% rename from tests/functional/help.sh rename to src/nix-functional-tests/help.sh diff --git a/tests/functional/hermetic.nix b/src/nix-functional-tests/hermetic.nix similarity index 100% rename from tests/functional/hermetic.nix rename to src/nix-functional-tests/hermetic.nix diff --git a/tests/functional/ifd.nix b/src/nix-functional-tests/ifd.nix similarity index 100% rename from tests/functional/ifd.nix rename to src/nix-functional-tests/ifd.nix diff --git a/tests/functional/import-from-derivation.nix b/src/nix-functional-tests/import-from-derivation.nix similarity index 100% rename from tests/functional/import-from-derivation.nix rename to src/nix-functional-tests/import-from-derivation.nix diff --git a/tests/functional/import-from-derivation.sh b/src/nix-functional-tests/import-from-derivation.sh similarity index 100% rename from tests/functional/import-from-derivation.sh rename to src/nix-functional-tests/import-from-derivation.sh diff --git a/tests/functional/impure-derivations.nix b/src/nix-functional-tests/impure-derivations.nix similarity index 100% rename from tests/functional/impure-derivations.nix rename to src/nix-functional-tests/impure-derivations.nix diff --git a/tests/functional/impure-derivations.sh b/src/nix-functional-tests/impure-derivations.sh similarity index 100% rename from tests/functional/impure-derivations.sh rename to src/nix-functional-tests/impure-derivations.sh diff --git a/tests/functional/impure-env.nix b/src/nix-functional-tests/impure-env.nix similarity index 100% rename from tests/functional/impure-env.nix rename to src/nix-functional-tests/impure-env.nix diff --git a/tests/functional/impure-env.sh b/src/nix-functional-tests/impure-env.sh similarity index 100% rename from tests/functional/impure-env.sh rename to src/nix-functional-tests/impure-env.sh diff --git a/tests/functional/impure-eval.sh b/src/nix-functional-tests/impure-eval.sh similarity index 100% rename from tests/functional/impure-eval.sh rename to src/nix-functional-tests/impure-eval.sh diff --git a/tests/functional/install-darwin.sh b/src/nix-functional-tests/install-darwin.sh similarity index 100% rename from tests/functional/install-darwin.sh rename to src/nix-functional-tests/install-darwin.sh diff --git a/tests/functional/lang-gc.sh b/src/nix-functional-tests/lang-gc.sh similarity index 100% rename from tests/functional/lang-gc.sh rename to src/nix-functional-tests/lang-gc.sh diff --git a/tests/functional/lang-gc/issue-11141-gc-coroutine-test.nix b/src/nix-functional-tests/lang-gc/issue-11141-gc-coroutine-test.nix similarity index 100% rename from tests/functional/lang-gc/issue-11141-gc-coroutine-test.nix rename to src/nix-functional-tests/lang-gc/issue-11141-gc-coroutine-test.nix diff --git a/tests/functional/lang.sh b/src/nix-functional-tests/lang.sh similarity index 100% rename from tests/functional/lang.sh rename to src/nix-functional-tests/lang.sh diff --git a/tests/functional/lang/binary-data b/src/nix-functional-tests/lang/binary-data similarity index 100% rename from tests/functional/lang/binary-data rename to src/nix-functional-tests/lang/binary-data diff --git a/tests/functional/lang/data b/src/nix-functional-tests/lang/data similarity index 100% rename from tests/functional/lang/data rename to src/nix-functional-tests/lang/data diff --git a/tests/functional/lang/dir1/a.nix b/src/nix-functional-tests/lang/dir1/a.nix similarity index 100% rename from tests/functional/lang/dir1/a.nix rename to src/nix-functional-tests/lang/dir1/a.nix diff --git a/tests/functional/lang/dir2/a.nix b/src/nix-functional-tests/lang/dir2/a.nix similarity index 100% rename from tests/functional/lang/dir2/a.nix rename to src/nix-functional-tests/lang/dir2/a.nix diff --git a/tests/functional/lang/dir2/b.nix b/src/nix-functional-tests/lang/dir2/b.nix similarity index 100% rename from tests/functional/lang/dir2/b.nix rename to src/nix-functional-tests/lang/dir2/b.nix diff --git a/tests/functional/lang/dir3/a.nix b/src/nix-functional-tests/lang/dir3/a.nix similarity index 100% rename from tests/functional/lang/dir3/a.nix rename to src/nix-functional-tests/lang/dir3/a.nix diff --git a/tests/functional/lang/dir3/b.nix b/src/nix-functional-tests/lang/dir3/b.nix similarity index 100% rename from tests/functional/lang/dir3/b.nix rename to src/nix-functional-tests/lang/dir3/b.nix diff --git a/tests/functional/lang/dir3/c.nix b/src/nix-functional-tests/lang/dir3/c.nix similarity index 100% rename from tests/functional/lang/dir3/c.nix rename to src/nix-functional-tests/lang/dir3/c.nix diff --git a/tests/functional/lang/dir4/a.nix b/src/nix-functional-tests/lang/dir4/a.nix similarity index 100% rename from tests/functional/lang/dir4/a.nix rename to src/nix-functional-tests/lang/dir4/a.nix diff --git a/tests/functional/lang/dir4/c.nix b/src/nix-functional-tests/lang/dir4/c.nix similarity index 100% rename from tests/functional/lang/dir4/c.nix rename to src/nix-functional-tests/lang/dir4/c.nix diff --git a/tests/functional/lang/eval-fail-abort.err.exp b/src/nix-functional-tests/lang/eval-fail-abort.err.exp similarity index 100% rename from tests/functional/lang/eval-fail-abort.err.exp rename to src/nix-functional-tests/lang/eval-fail-abort.err.exp diff --git a/tests/functional/lang/eval-fail-abort.nix b/src/nix-functional-tests/lang/eval-fail-abort.nix similarity index 100% rename from tests/functional/lang/eval-fail-abort.nix rename to src/nix-functional-tests/lang/eval-fail-abort.nix diff --git a/tests/functional/lang/eval-fail-addDrvOutputDependencies-empty-context.err.exp b/src/nix-functional-tests/lang/eval-fail-addDrvOutputDependencies-empty-context.err.exp similarity index 100% rename from tests/functional/lang/eval-fail-addDrvOutputDependencies-empty-context.err.exp rename to src/nix-functional-tests/lang/eval-fail-addDrvOutputDependencies-empty-context.err.exp diff --git a/tests/functional/lang/eval-fail-addDrvOutputDependencies-empty-context.nix b/src/nix-functional-tests/lang/eval-fail-addDrvOutputDependencies-empty-context.nix similarity index 100% rename from tests/functional/lang/eval-fail-addDrvOutputDependencies-empty-context.nix rename to src/nix-functional-tests/lang/eval-fail-addDrvOutputDependencies-empty-context.nix diff --git a/tests/functional/lang/eval-fail-addDrvOutputDependencies-multi-elem-context.err.exp b/src/nix-functional-tests/lang/eval-fail-addDrvOutputDependencies-multi-elem-context.err.exp similarity index 100% rename from tests/functional/lang/eval-fail-addDrvOutputDependencies-multi-elem-context.err.exp rename to src/nix-functional-tests/lang/eval-fail-addDrvOutputDependencies-multi-elem-context.err.exp diff --git a/tests/functional/lang/eval-fail-addDrvOutputDependencies-multi-elem-context.nix b/src/nix-functional-tests/lang/eval-fail-addDrvOutputDependencies-multi-elem-context.nix similarity index 100% rename from tests/functional/lang/eval-fail-addDrvOutputDependencies-multi-elem-context.nix rename to src/nix-functional-tests/lang/eval-fail-addDrvOutputDependencies-multi-elem-context.nix diff --git a/tests/functional/lang/eval-fail-addDrvOutputDependencies-wrong-element-kind.err.exp b/src/nix-functional-tests/lang/eval-fail-addDrvOutputDependencies-wrong-element-kind.err.exp similarity index 100% rename from tests/functional/lang/eval-fail-addDrvOutputDependencies-wrong-element-kind.err.exp rename to src/nix-functional-tests/lang/eval-fail-addDrvOutputDependencies-wrong-element-kind.err.exp diff --git a/tests/functional/lang/eval-fail-addDrvOutputDependencies-wrong-element-kind.nix b/src/nix-functional-tests/lang/eval-fail-addDrvOutputDependencies-wrong-element-kind.nix similarity index 100% rename from tests/functional/lang/eval-fail-addDrvOutputDependencies-wrong-element-kind.nix rename to src/nix-functional-tests/lang/eval-fail-addDrvOutputDependencies-wrong-element-kind.nix diff --git a/tests/functional/lang/eval-fail-addErrorContext-example.err.exp b/src/nix-functional-tests/lang/eval-fail-addErrorContext-example.err.exp similarity index 100% rename from tests/functional/lang/eval-fail-addErrorContext-example.err.exp rename to src/nix-functional-tests/lang/eval-fail-addErrorContext-example.err.exp diff --git a/tests/functional/lang/eval-fail-addErrorContext-example.flags b/src/nix-functional-tests/lang/eval-fail-addErrorContext-example.flags similarity index 100% rename from tests/functional/lang/eval-fail-addErrorContext-example.flags rename to src/nix-functional-tests/lang/eval-fail-addErrorContext-example.flags diff --git a/tests/functional/lang/eval-fail-addErrorContext-example.nix b/src/nix-functional-tests/lang/eval-fail-addErrorContext-example.nix similarity index 100% rename from tests/functional/lang/eval-fail-addErrorContext-example.nix rename to src/nix-functional-tests/lang/eval-fail-addErrorContext-example.nix diff --git a/tests/functional/lang/eval-fail-assert-equal-attrs-names-2.err.exp b/src/nix-functional-tests/lang/eval-fail-assert-equal-attrs-names-2.err.exp similarity index 100% rename from tests/functional/lang/eval-fail-assert-equal-attrs-names-2.err.exp rename to src/nix-functional-tests/lang/eval-fail-assert-equal-attrs-names-2.err.exp diff --git a/tests/functional/lang/eval-fail-assert-equal-attrs-names-2.nix b/src/nix-functional-tests/lang/eval-fail-assert-equal-attrs-names-2.nix similarity index 100% rename from tests/functional/lang/eval-fail-assert-equal-attrs-names-2.nix rename to src/nix-functional-tests/lang/eval-fail-assert-equal-attrs-names-2.nix diff --git a/tests/functional/lang/eval-fail-assert-equal-attrs-names.err.exp b/src/nix-functional-tests/lang/eval-fail-assert-equal-attrs-names.err.exp similarity index 100% rename from tests/functional/lang/eval-fail-assert-equal-attrs-names.err.exp rename to src/nix-functional-tests/lang/eval-fail-assert-equal-attrs-names.err.exp diff --git a/tests/functional/lang/eval-fail-assert-equal-attrs-names.nix b/src/nix-functional-tests/lang/eval-fail-assert-equal-attrs-names.nix similarity index 100% rename from tests/functional/lang/eval-fail-assert-equal-attrs-names.nix rename to src/nix-functional-tests/lang/eval-fail-assert-equal-attrs-names.nix diff --git a/tests/functional/lang/eval-fail-assert-equal-derivations-extra.err.exp b/src/nix-functional-tests/lang/eval-fail-assert-equal-derivations-extra.err.exp similarity index 100% rename from tests/functional/lang/eval-fail-assert-equal-derivations-extra.err.exp rename to src/nix-functional-tests/lang/eval-fail-assert-equal-derivations-extra.err.exp diff --git a/tests/functional/lang/eval-fail-assert-equal-derivations-extra.nix b/src/nix-functional-tests/lang/eval-fail-assert-equal-derivations-extra.nix similarity index 100% rename from tests/functional/lang/eval-fail-assert-equal-derivations-extra.nix rename to src/nix-functional-tests/lang/eval-fail-assert-equal-derivations-extra.nix diff --git a/tests/functional/lang/eval-fail-assert-equal-derivations.err.exp b/src/nix-functional-tests/lang/eval-fail-assert-equal-derivations.err.exp similarity index 100% rename from tests/functional/lang/eval-fail-assert-equal-derivations.err.exp rename to src/nix-functional-tests/lang/eval-fail-assert-equal-derivations.err.exp diff --git a/tests/functional/lang/eval-fail-assert-equal-derivations.nix b/src/nix-functional-tests/lang/eval-fail-assert-equal-derivations.nix similarity index 100% rename from tests/functional/lang/eval-fail-assert-equal-derivations.nix rename to src/nix-functional-tests/lang/eval-fail-assert-equal-derivations.nix diff --git a/tests/functional/lang/eval-fail-assert-equal-floats.err.exp b/src/nix-functional-tests/lang/eval-fail-assert-equal-floats.err.exp similarity index 100% rename from tests/functional/lang/eval-fail-assert-equal-floats.err.exp rename to src/nix-functional-tests/lang/eval-fail-assert-equal-floats.err.exp diff --git a/tests/functional/lang/eval-fail-assert-equal-floats.nix b/src/nix-functional-tests/lang/eval-fail-assert-equal-floats.nix similarity index 100% rename from tests/functional/lang/eval-fail-assert-equal-floats.nix rename to src/nix-functional-tests/lang/eval-fail-assert-equal-floats.nix diff --git a/tests/functional/lang/eval-fail-assert-equal-function-direct.err.exp b/src/nix-functional-tests/lang/eval-fail-assert-equal-function-direct.err.exp similarity index 100% rename from tests/functional/lang/eval-fail-assert-equal-function-direct.err.exp rename to src/nix-functional-tests/lang/eval-fail-assert-equal-function-direct.err.exp diff --git a/tests/functional/lang/eval-fail-assert-equal-function-direct.nix b/src/nix-functional-tests/lang/eval-fail-assert-equal-function-direct.nix similarity index 100% rename from tests/functional/lang/eval-fail-assert-equal-function-direct.nix rename to src/nix-functional-tests/lang/eval-fail-assert-equal-function-direct.nix diff --git a/tests/functional/lang/eval-fail-assert-equal-int-float.err.exp b/src/nix-functional-tests/lang/eval-fail-assert-equal-int-float.err.exp similarity index 100% rename from tests/functional/lang/eval-fail-assert-equal-int-float.err.exp rename to src/nix-functional-tests/lang/eval-fail-assert-equal-int-float.err.exp diff --git a/tests/functional/lang/eval-fail-assert-equal-int-float.nix b/src/nix-functional-tests/lang/eval-fail-assert-equal-int-float.nix similarity index 100% rename from tests/functional/lang/eval-fail-assert-equal-int-float.nix rename to src/nix-functional-tests/lang/eval-fail-assert-equal-int-float.nix diff --git a/tests/functional/lang/eval-fail-assert-equal-ints.err.exp b/src/nix-functional-tests/lang/eval-fail-assert-equal-ints.err.exp similarity index 100% rename from tests/functional/lang/eval-fail-assert-equal-ints.err.exp rename to src/nix-functional-tests/lang/eval-fail-assert-equal-ints.err.exp diff --git a/tests/functional/lang/eval-fail-assert-equal-ints.nix b/src/nix-functional-tests/lang/eval-fail-assert-equal-ints.nix similarity index 100% rename from tests/functional/lang/eval-fail-assert-equal-ints.nix rename to src/nix-functional-tests/lang/eval-fail-assert-equal-ints.nix diff --git a/tests/functional/lang/eval-fail-assert-equal-list-length.err.exp b/src/nix-functional-tests/lang/eval-fail-assert-equal-list-length.err.exp similarity index 100% rename from tests/functional/lang/eval-fail-assert-equal-list-length.err.exp rename to src/nix-functional-tests/lang/eval-fail-assert-equal-list-length.err.exp diff --git a/tests/functional/lang/eval-fail-assert-equal-list-length.nix b/src/nix-functional-tests/lang/eval-fail-assert-equal-list-length.nix similarity index 100% rename from tests/functional/lang/eval-fail-assert-equal-list-length.nix rename to src/nix-functional-tests/lang/eval-fail-assert-equal-list-length.nix diff --git a/tests/functional/lang/eval-fail-assert-equal-paths.err.exp b/src/nix-functional-tests/lang/eval-fail-assert-equal-paths.err.exp similarity index 100% rename from tests/functional/lang/eval-fail-assert-equal-paths.err.exp rename to src/nix-functional-tests/lang/eval-fail-assert-equal-paths.err.exp diff --git a/tests/functional/lang/eval-fail-assert-equal-paths.nix b/src/nix-functional-tests/lang/eval-fail-assert-equal-paths.nix similarity index 100% rename from tests/functional/lang/eval-fail-assert-equal-paths.nix rename to src/nix-functional-tests/lang/eval-fail-assert-equal-paths.nix diff --git a/tests/functional/lang/eval-fail-assert-equal-type-nested.err.exp b/src/nix-functional-tests/lang/eval-fail-assert-equal-type-nested.err.exp similarity index 100% rename from tests/functional/lang/eval-fail-assert-equal-type-nested.err.exp rename to src/nix-functional-tests/lang/eval-fail-assert-equal-type-nested.err.exp diff --git a/tests/functional/lang/eval-fail-assert-equal-type-nested.nix b/src/nix-functional-tests/lang/eval-fail-assert-equal-type-nested.nix similarity index 100% rename from tests/functional/lang/eval-fail-assert-equal-type-nested.nix rename to src/nix-functional-tests/lang/eval-fail-assert-equal-type-nested.nix diff --git a/tests/functional/lang/eval-fail-assert-equal-type.err.exp b/src/nix-functional-tests/lang/eval-fail-assert-equal-type.err.exp similarity index 100% rename from tests/functional/lang/eval-fail-assert-equal-type.err.exp rename to src/nix-functional-tests/lang/eval-fail-assert-equal-type.err.exp diff --git a/tests/functional/lang/eval-fail-assert-equal-type.nix b/src/nix-functional-tests/lang/eval-fail-assert-equal-type.nix similarity index 100% rename from tests/functional/lang/eval-fail-assert-equal-type.nix rename to src/nix-functional-tests/lang/eval-fail-assert-equal-type.nix diff --git a/tests/functional/lang/eval-fail-assert-nested-bool.err.exp b/src/nix-functional-tests/lang/eval-fail-assert-nested-bool.err.exp similarity index 100% rename from tests/functional/lang/eval-fail-assert-nested-bool.err.exp rename to src/nix-functional-tests/lang/eval-fail-assert-nested-bool.err.exp diff --git a/tests/functional/lang/eval-fail-assert-nested-bool.nix b/src/nix-functional-tests/lang/eval-fail-assert-nested-bool.nix similarity index 100% rename from tests/functional/lang/eval-fail-assert-nested-bool.nix rename to src/nix-functional-tests/lang/eval-fail-assert-nested-bool.nix diff --git a/tests/functional/lang/eval-fail-assert.err.exp b/src/nix-functional-tests/lang/eval-fail-assert.err.exp similarity index 100% rename from tests/functional/lang/eval-fail-assert.err.exp rename to src/nix-functional-tests/lang/eval-fail-assert.err.exp diff --git a/tests/functional/lang/eval-fail-assert.nix b/src/nix-functional-tests/lang/eval-fail-assert.nix similarity index 100% rename from tests/functional/lang/eval-fail-assert.nix rename to src/nix-functional-tests/lang/eval-fail-assert.nix diff --git a/tests/functional/lang/eval-fail-attr-name-type.err.exp b/src/nix-functional-tests/lang/eval-fail-attr-name-type.err.exp similarity index 100% rename from tests/functional/lang/eval-fail-attr-name-type.err.exp rename to src/nix-functional-tests/lang/eval-fail-attr-name-type.err.exp diff --git a/tests/functional/lang/eval-fail-attr-name-type.nix b/src/nix-functional-tests/lang/eval-fail-attr-name-type.nix similarity index 100% rename from tests/functional/lang/eval-fail-attr-name-type.nix rename to src/nix-functional-tests/lang/eval-fail-attr-name-type.nix diff --git a/tests/functional/lang/eval-fail-bad-string-interpolation-1.err.exp b/src/nix-functional-tests/lang/eval-fail-bad-string-interpolation-1.err.exp similarity index 100% rename from tests/functional/lang/eval-fail-bad-string-interpolation-1.err.exp rename to src/nix-functional-tests/lang/eval-fail-bad-string-interpolation-1.err.exp diff --git a/tests/functional/lang/eval-fail-bad-string-interpolation-1.nix b/src/nix-functional-tests/lang/eval-fail-bad-string-interpolation-1.nix similarity index 100% rename from tests/functional/lang/eval-fail-bad-string-interpolation-1.nix rename to src/nix-functional-tests/lang/eval-fail-bad-string-interpolation-1.nix diff --git a/tests/functional/lang/eval-fail-bad-string-interpolation-2.err.exp b/src/nix-functional-tests/lang/eval-fail-bad-string-interpolation-2.err.exp similarity index 100% rename from tests/functional/lang/eval-fail-bad-string-interpolation-2.err.exp rename to src/nix-functional-tests/lang/eval-fail-bad-string-interpolation-2.err.exp diff --git a/tests/functional/lang/eval-fail-bad-string-interpolation-2.nix b/src/nix-functional-tests/lang/eval-fail-bad-string-interpolation-2.nix similarity index 100% rename from tests/functional/lang/eval-fail-bad-string-interpolation-2.nix rename to src/nix-functional-tests/lang/eval-fail-bad-string-interpolation-2.nix diff --git a/tests/functional/lang/eval-fail-bad-string-interpolation-3.err.exp b/src/nix-functional-tests/lang/eval-fail-bad-string-interpolation-3.err.exp similarity index 100% rename from tests/functional/lang/eval-fail-bad-string-interpolation-3.err.exp rename to src/nix-functional-tests/lang/eval-fail-bad-string-interpolation-3.err.exp diff --git a/tests/functional/lang/eval-fail-bad-string-interpolation-3.nix b/src/nix-functional-tests/lang/eval-fail-bad-string-interpolation-3.nix similarity index 100% rename from tests/functional/lang/eval-fail-bad-string-interpolation-3.nix rename to src/nix-functional-tests/lang/eval-fail-bad-string-interpolation-3.nix diff --git a/tests/functional/lang/eval-fail-bad-string-interpolation-4.err.exp b/src/nix-functional-tests/lang/eval-fail-bad-string-interpolation-4.err.exp similarity index 100% rename from tests/functional/lang/eval-fail-bad-string-interpolation-4.err.exp rename to src/nix-functional-tests/lang/eval-fail-bad-string-interpolation-4.err.exp diff --git a/tests/functional/lang/eval-fail-bad-string-interpolation-4.nix b/src/nix-functional-tests/lang/eval-fail-bad-string-interpolation-4.nix similarity index 100% rename from tests/functional/lang/eval-fail-bad-string-interpolation-4.nix rename to src/nix-functional-tests/lang/eval-fail-bad-string-interpolation-4.nix diff --git a/tests/functional/lang/eval-fail-blackhole.err.exp b/src/nix-functional-tests/lang/eval-fail-blackhole.err.exp similarity index 100% rename from tests/functional/lang/eval-fail-blackhole.err.exp rename to src/nix-functional-tests/lang/eval-fail-blackhole.err.exp diff --git a/tests/functional/lang/eval-fail-blackhole.nix b/src/nix-functional-tests/lang/eval-fail-blackhole.nix similarity index 100% rename from tests/functional/lang/eval-fail-blackhole.nix rename to src/nix-functional-tests/lang/eval-fail-blackhole.nix diff --git a/tests/functional/lang/eval-fail-call-primop.err.exp b/src/nix-functional-tests/lang/eval-fail-call-primop.err.exp similarity index 100% rename from tests/functional/lang/eval-fail-call-primop.err.exp rename to src/nix-functional-tests/lang/eval-fail-call-primop.err.exp diff --git a/tests/functional/lang/eval-fail-call-primop.nix b/src/nix-functional-tests/lang/eval-fail-call-primop.nix similarity index 100% rename from tests/functional/lang/eval-fail-call-primop.nix rename to src/nix-functional-tests/lang/eval-fail-call-primop.nix diff --git a/tests/functional/lang/eval-fail-deepseq.err.exp b/src/nix-functional-tests/lang/eval-fail-deepseq.err.exp similarity index 100% rename from tests/functional/lang/eval-fail-deepseq.err.exp rename to src/nix-functional-tests/lang/eval-fail-deepseq.err.exp diff --git a/tests/functional/lang/eval-fail-deepseq.nix b/src/nix-functional-tests/lang/eval-fail-deepseq.nix similarity index 100% rename from tests/functional/lang/eval-fail-deepseq.nix rename to src/nix-functional-tests/lang/eval-fail-deepseq.nix diff --git a/tests/functional/lang/eval-fail-derivation-name.err.exp b/src/nix-functional-tests/lang/eval-fail-derivation-name.err.exp similarity index 100% rename from tests/functional/lang/eval-fail-derivation-name.err.exp rename to src/nix-functional-tests/lang/eval-fail-derivation-name.err.exp diff --git a/tests/functional/lang/eval-fail-derivation-name.nix b/src/nix-functional-tests/lang/eval-fail-derivation-name.nix similarity index 100% rename from tests/functional/lang/eval-fail-derivation-name.nix rename to src/nix-functional-tests/lang/eval-fail-derivation-name.nix diff --git a/tests/functional/lang/eval-fail-derivation-name.postprocess b/src/nix-functional-tests/lang/eval-fail-derivation-name.postprocess similarity index 100% rename from tests/functional/lang/eval-fail-derivation-name.postprocess rename to src/nix-functional-tests/lang/eval-fail-derivation-name.postprocess diff --git a/tests/functional/lang/eval-fail-dup-dynamic-attrs.err.exp b/src/nix-functional-tests/lang/eval-fail-dup-dynamic-attrs.err.exp similarity index 100% rename from tests/functional/lang/eval-fail-dup-dynamic-attrs.err.exp rename to src/nix-functional-tests/lang/eval-fail-dup-dynamic-attrs.err.exp diff --git a/tests/functional/lang/eval-fail-dup-dynamic-attrs.nix b/src/nix-functional-tests/lang/eval-fail-dup-dynamic-attrs.nix similarity index 100% rename from tests/functional/lang/eval-fail-dup-dynamic-attrs.nix rename to src/nix-functional-tests/lang/eval-fail-dup-dynamic-attrs.nix diff --git a/tests/functional/lang/eval-fail-duplicate-traces.err.exp b/src/nix-functional-tests/lang/eval-fail-duplicate-traces.err.exp similarity index 100% rename from tests/functional/lang/eval-fail-duplicate-traces.err.exp rename to src/nix-functional-tests/lang/eval-fail-duplicate-traces.err.exp diff --git a/tests/functional/lang/eval-fail-duplicate-traces.nix b/src/nix-functional-tests/lang/eval-fail-duplicate-traces.nix similarity index 100% rename from tests/functional/lang/eval-fail-duplicate-traces.nix rename to src/nix-functional-tests/lang/eval-fail-duplicate-traces.nix diff --git a/tests/functional/lang/eval-fail-eol-1.err.exp b/src/nix-functional-tests/lang/eval-fail-eol-1.err.exp similarity index 100% rename from tests/functional/lang/eval-fail-eol-1.err.exp rename to src/nix-functional-tests/lang/eval-fail-eol-1.err.exp diff --git a/tests/functional/lang/eval-fail-eol-1.nix b/src/nix-functional-tests/lang/eval-fail-eol-1.nix similarity index 100% rename from tests/functional/lang/eval-fail-eol-1.nix rename to src/nix-functional-tests/lang/eval-fail-eol-1.nix diff --git a/tests/functional/lang/eval-fail-eol-2.err.exp b/src/nix-functional-tests/lang/eval-fail-eol-2.err.exp similarity index 100% rename from tests/functional/lang/eval-fail-eol-2.err.exp rename to src/nix-functional-tests/lang/eval-fail-eol-2.err.exp diff --git a/tests/functional/lang/eval-fail-eol-2.nix b/src/nix-functional-tests/lang/eval-fail-eol-2.nix similarity index 100% rename from tests/functional/lang/eval-fail-eol-2.nix rename to src/nix-functional-tests/lang/eval-fail-eol-2.nix diff --git a/tests/functional/lang/eval-fail-eol-3.err.exp b/src/nix-functional-tests/lang/eval-fail-eol-3.err.exp similarity index 100% rename from tests/functional/lang/eval-fail-eol-3.err.exp rename to src/nix-functional-tests/lang/eval-fail-eol-3.err.exp diff --git a/tests/functional/lang/eval-fail-eol-3.nix b/src/nix-functional-tests/lang/eval-fail-eol-3.nix similarity index 100% rename from tests/functional/lang/eval-fail-eol-3.nix rename to src/nix-functional-tests/lang/eval-fail-eol-3.nix diff --git a/tests/functional/lang/eval-fail-fetchTree-negative.err.exp b/src/nix-functional-tests/lang/eval-fail-fetchTree-negative.err.exp similarity index 100% rename from tests/functional/lang/eval-fail-fetchTree-negative.err.exp rename to src/nix-functional-tests/lang/eval-fail-fetchTree-negative.err.exp diff --git a/tests/functional/lang/eval-fail-fetchTree-negative.nix b/src/nix-functional-tests/lang/eval-fail-fetchTree-negative.nix similarity index 100% rename from tests/functional/lang/eval-fail-fetchTree-negative.nix rename to src/nix-functional-tests/lang/eval-fail-fetchTree-negative.nix diff --git a/tests/functional/lang/eval-fail-fetchurl-baseName-attrs-name.err.exp b/src/nix-functional-tests/lang/eval-fail-fetchurl-baseName-attrs-name.err.exp similarity index 100% rename from tests/functional/lang/eval-fail-fetchurl-baseName-attrs-name.err.exp rename to src/nix-functional-tests/lang/eval-fail-fetchurl-baseName-attrs-name.err.exp diff --git a/tests/functional/lang/eval-fail-fetchurl-baseName-attrs-name.nix b/src/nix-functional-tests/lang/eval-fail-fetchurl-baseName-attrs-name.nix similarity index 100% rename from tests/functional/lang/eval-fail-fetchurl-baseName-attrs-name.nix rename to src/nix-functional-tests/lang/eval-fail-fetchurl-baseName-attrs-name.nix diff --git a/tests/functional/lang/eval-fail-fetchurl-baseName-attrs.err.exp b/src/nix-functional-tests/lang/eval-fail-fetchurl-baseName-attrs.err.exp similarity index 100% rename from tests/functional/lang/eval-fail-fetchurl-baseName-attrs.err.exp rename to src/nix-functional-tests/lang/eval-fail-fetchurl-baseName-attrs.err.exp diff --git a/tests/functional/lang/eval-fail-fetchurl-baseName-attrs.nix b/src/nix-functional-tests/lang/eval-fail-fetchurl-baseName-attrs.nix similarity index 100% rename from tests/functional/lang/eval-fail-fetchurl-baseName-attrs.nix rename to src/nix-functional-tests/lang/eval-fail-fetchurl-baseName-attrs.nix diff --git a/tests/functional/lang/eval-fail-fetchurl-baseName.err.exp b/src/nix-functional-tests/lang/eval-fail-fetchurl-baseName.err.exp similarity index 100% rename from tests/functional/lang/eval-fail-fetchurl-baseName.err.exp rename to src/nix-functional-tests/lang/eval-fail-fetchurl-baseName.err.exp diff --git a/tests/functional/lang/eval-fail-fetchurl-baseName.nix b/src/nix-functional-tests/lang/eval-fail-fetchurl-baseName.nix similarity index 100% rename from tests/functional/lang/eval-fail-fetchurl-baseName.nix rename to src/nix-functional-tests/lang/eval-fail-fetchurl-baseName.nix diff --git a/tests/functional/lang/eval-fail-flake-ref-to-string-negative-integer.err.exp b/src/nix-functional-tests/lang/eval-fail-flake-ref-to-string-negative-integer.err.exp similarity index 100% rename from tests/functional/lang/eval-fail-flake-ref-to-string-negative-integer.err.exp rename to src/nix-functional-tests/lang/eval-fail-flake-ref-to-string-negative-integer.err.exp diff --git a/tests/functional/lang/eval-fail-flake-ref-to-string-negative-integer.nix b/src/nix-functional-tests/lang/eval-fail-flake-ref-to-string-negative-integer.nix similarity index 100% rename from tests/functional/lang/eval-fail-flake-ref-to-string-negative-integer.nix rename to src/nix-functional-tests/lang/eval-fail-flake-ref-to-string-negative-integer.nix diff --git a/tests/functional/lang/eval-fail-foldlStrict-strict-op-application.err.exp b/src/nix-functional-tests/lang/eval-fail-foldlStrict-strict-op-application.err.exp similarity index 100% rename from tests/functional/lang/eval-fail-foldlStrict-strict-op-application.err.exp rename to src/nix-functional-tests/lang/eval-fail-foldlStrict-strict-op-application.err.exp diff --git a/tests/functional/lang/eval-fail-foldlStrict-strict-op-application.nix b/src/nix-functional-tests/lang/eval-fail-foldlStrict-strict-op-application.nix similarity index 100% rename from tests/functional/lang/eval-fail-foldlStrict-strict-op-application.nix rename to src/nix-functional-tests/lang/eval-fail-foldlStrict-strict-op-application.nix diff --git a/tests/functional/lang/eval-fail-fromJSON-overflowing.err.exp b/src/nix-functional-tests/lang/eval-fail-fromJSON-overflowing.err.exp similarity index 100% rename from tests/functional/lang/eval-fail-fromJSON-overflowing.err.exp rename to src/nix-functional-tests/lang/eval-fail-fromJSON-overflowing.err.exp diff --git a/tests/functional/lang/eval-fail-fromJSON-overflowing.nix b/src/nix-functional-tests/lang/eval-fail-fromJSON-overflowing.nix similarity index 100% rename from tests/functional/lang/eval-fail-fromJSON-overflowing.nix rename to src/nix-functional-tests/lang/eval-fail-fromJSON-overflowing.nix diff --git a/tests/functional/lang/eval-fail-fromTOML-timestamps.err.exp b/src/nix-functional-tests/lang/eval-fail-fromTOML-timestamps.err.exp similarity index 100% rename from tests/functional/lang/eval-fail-fromTOML-timestamps.err.exp rename to src/nix-functional-tests/lang/eval-fail-fromTOML-timestamps.err.exp diff --git a/tests/functional/lang/eval-fail-fromTOML-timestamps.nix b/src/nix-functional-tests/lang/eval-fail-fromTOML-timestamps.nix similarity index 100% rename from tests/functional/lang/eval-fail-fromTOML-timestamps.nix rename to src/nix-functional-tests/lang/eval-fail-fromTOML-timestamps.nix diff --git a/tests/functional/lang/eval-fail-hashfile-missing.err.exp b/src/nix-functional-tests/lang/eval-fail-hashfile-missing.err.exp similarity index 100% rename from tests/functional/lang/eval-fail-hashfile-missing.err.exp rename to src/nix-functional-tests/lang/eval-fail-hashfile-missing.err.exp diff --git a/tests/functional/lang/eval-fail-hashfile-missing.nix b/src/nix-functional-tests/lang/eval-fail-hashfile-missing.nix similarity index 100% rename from tests/functional/lang/eval-fail-hashfile-missing.nix rename to src/nix-functional-tests/lang/eval-fail-hashfile-missing.nix diff --git a/tests/functional/lang/eval-fail-infinite-recursion-lambda.err.exp b/src/nix-functional-tests/lang/eval-fail-infinite-recursion-lambda.err.exp similarity index 100% rename from tests/functional/lang/eval-fail-infinite-recursion-lambda.err.exp rename to src/nix-functional-tests/lang/eval-fail-infinite-recursion-lambda.err.exp diff --git a/tests/functional/lang/eval-fail-infinite-recursion-lambda.flags b/src/nix-functional-tests/lang/eval-fail-infinite-recursion-lambda.flags similarity index 100% rename from tests/functional/lang/eval-fail-infinite-recursion-lambda.flags rename to src/nix-functional-tests/lang/eval-fail-infinite-recursion-lambda.flags diff --git a/tests/functional/lang/eval-fail-infinite-recursion-lambda.nix b/src/nix-functional-tests/lang/eval-fail-infinite-recursion-lambda.nix similarity index 100% rename from tests/functional/lang/eval-fail-infinite-recursion-lambda.nix rename to src/nix-functional-tests/lang/eval-fail-infinite-recursion-lambda.nix diff --git a/tests/functional/lang/eval-fail-list.err.exp b/src/nix-functional-tests/lang/eval-fail-list.err.exp similarity index 100% rename from tests/functional/lang/eval-fail-list.err.exp rename to src/nix-functional-tests/lang/eval-fail-list.err.exp diff --git a/tests/functional/lang/eval-fail-list.nix b/src/nix-functional-tests/lang/eval-fail-list.nix similarity index 100% rename from tests/functional/lang/eval-fail-list.nix rename to src/nix-functional-tests/lang/eval-fail-list.nix diff --git a/tests/functional/lang/eval-fail-missing-arg.err.exp b/src/nix-functional-tests/lang/eval-fail-missing-arg.err.exp similarity index 100% rename from tests/functional/lang/eval-fail-missing-arg.err.exp rename to src/nix-functional-tests/lang/eval-fail-missing-arg.err.exp diff --git a/tests/functional/lang/eval-fail-missing-arg.nix b/src/nix-functional-tests/lang/eval-fail-missing-arg.nix similarity index 100% rename from tests/functional/lang/eval-fail-missing-arg.nix rename to src/nix-functional-tests/lang/eval-fail-missing-arg.nix diff --git a/tests/functional/lang/eval-fail-mutual-recursion.err.exp b/src/nix-functional-tests/lang/eval-fail-mutual-recursion.err.exp similarity index 100% rename from tests/functional/lang/eval-fail-mutual-recursion.err.exp rename to src/nix-functional-tests/lang/eval-fail-mutual-recursion.err.exp diff --git a/tests/functional/lang/eval-fail-mutual-recursion.nix b/src/nix-functional-tests/lang/eval-fail-mutual-recursion.nix similarity index 100% rename from tests/functional/lang/eval-fail-mutual-recursion.nix rename to src/nix-functional-tests/lang/eval-fail-mutual-recursion.nix diff --git a/tests/functional/lang/eval-fail-nested-list-items.err.exp b/src/nix-functional-tests/lang/eval-fail-nested-list-items.err.exp similarity index 100% rename from tests/functional/lang/eval-fail-nested-list-items.err.exp rename to src/nix-functional-tests/lang/eval-fail-nested-list-items.err.exp diff --git a/tests/functional/lang/eval-fail-nested-list-items.nix b/src/nix-functional-tests/lang/eval-fail-nested-list-items.nix similarity index 100% rename from tests/functional/lang/eval-fail-nested-list-items.nix rename to src/nix-functional-tests/lang/eval-fail-nested-list-items.nix diff --git a/tests/functional/lang/eval-fail-nonexist-path.err.exp b/src/nix-functional-tests/lang/eval-fail-nonexist-path.err.exp similarity index 100% rename from tests/functional/lang/eval-fail-nonexist-path.err.exp rename to src/nix-functional-tests/lang/eval-fail-nonexist-path.err.exp diff --git a/tests/functional/lang/eval-fail-nonexist-path.nix b/src/nix-functional-tests/lang/eval-fail-nonexist-path.nix similarity index 100% rename from tests/functional/lang/eval-fail-nonexist-path.nix rename to src/nix-functional-tests/lang/eval-fail-nonexist-path.nix diff --git a/tests/functional/lang/eval-fail-not-throws.err.exp b/src/nix-functional-tests/lang/eval-fail-not-throws.err.exp similarity index 100% rename from tests/functional/lang/eval-fail-not-throws.err.exp rename to src/nix-functional-tests/lang/eval-fail-not-throws.err.exp diff --git a/tests/functional/lang/eval-fail-not-throws.nix b/src/nix-functional-tests/lang/eval-fail-not-throws.nix similarity index 100% rename from tests/functional/lang/eval-fail-not-throws.nix rename to src/nix-functional-tests/lang/eval-fail-not-throws.nix diff --git a/tests/functional/lang/eval-fail-overflowing-add.err.exp b/src/nix-functional-tests/lang/eval-fail-overflowing-add.err.exp similarity index 100% rename from tests/functional/lang/eval-fail-overflowing-add.err.exp rename to src/nix-functional-tests/lang/eval-fail-overflowing-add.err.exp diff --git a/tests/functional/lang/eval-fail-overflowing-add.nix b/src/nix-functional-tests/lang/eval-fail-overflowing-add.nix similarity index 100% rename from tests/functional/lang/eval-fail-overflowing-add.nix rename to src/nix-functional-tests/lang/eval-fail-overflowing-add.nix diff --git a/tests/functional/lang/eval-fail-overflowing-div.err.exp b/src/nix-functional-tests/lang/eval-fail-overflowing-div.err.exp similarity index 100% rename from tests/functional/lang/eval-fail-overflowing-div.err.exp rename to src/nix-functional-tests/lang/eval-fail-overflowing-div.err.exp diff --git a/tests/functional/lang/eval-fail-overflowing-div.nix b/src/nix-functional-tests/lang/eval-fail-overflowing-div.nix similarity index 100% rename from tests/functional/lang/eval-fail-overflowing-div.nix rename to src/nix-functional-tests/lang/eval-fail-overflowing-div.nix diff --git a/tests/functional/lang/eval-fail-overflowing-mul.err.exp b/src/nix-functional-tests/lang/eval-fail-overflowing-mul.err.exp similarity index 100% rename from tests/functional/lang/eval-fail-overflowing-mul.err.exp rename to src/nix-functional-tests/lang/eval-fail-overflowing-mul.err.exp diff --git a/tests/functional/lang/eval-fail-overflowing-mul.nix b/src/nix-functional-tests/lang/eval-fail-overflowing-mul.nix similarity index 100% rename from tests/functional/lang/eval-fail-overflowing-mul.nix rename to src/nix-functional-tests/lang/eval-fail-overflowing-mul.nix diff --git a/tests/functional/lang/eval-fail-overflowing-sub.err.exp b/src/nix-functional-tests/lang/eval-fail-overflowing-sub.err.exp similarity index 100% rename from tests/functional/lang/eval-fail-overflowing-sub.err.exp rename to src/nix-functional-tests/lang/eval-fail-overflowing-sub.err.exp diff --git a/tests/functional/lang/eval-fail-overflowing-sub.nix b/src/nix-functional-tests/lang/eval-fail-overflowing-sub.nix similarity index 100% rename from tests/functional/lang/eval-fail-overflowing-sub.nix rename to src/nix-functional-tests/lang/eval-fail-overflowing-sub.nix diff --git a/tests/functional/lang/eval-fail-path-slash.err.exp b/src/nix-functional-tests/lang/eval-fail-path-slash.err.exp similarity index 100% rename from tests/functional/lang/eval-fail-path-slash.err.exp rename to src/nix-functional-tests/lang/eval-fail-path-slash.err.exp diff --git a/tests/functional/lang/eval-fail-path-slash.nix b/src/nix-functional-tests/lang/eval-fail-path-slash.nix similarity index 100% rename from tests/functional/lang/eval-fail-path-slash.nix rename to src/nix-functional-tests/lang/eval-fail-path-slash.nix diff --git a/tests/functional/lang/eval-fail-pipe-operators.err.exp b/src/nix-functional-tests/lang/eval-fail-pipe-operators.err.exp similarity index 100% rename from tests/functional/lang/eval-fail-pipe-operators.err.exp rename to src/nix-functional-tests/lang/eval-fail-pipe-operators.err.exp diff --git a/tests/functional/lang/eval-fail-pipe-operators.nix b/src/nix-functional-tests/lang/eval-fail-pipe-operators.nix similarity index 100% rename from tests/functional/lang/eval-fail-pipe-operators.nix rename to src/nix-functional-tests/lang/eval-fail-pipe-operators.nix diff --git a/tests/functional/lang/eval-fail-recursion.err.exp b/src/nix-functional-tests/lang/eval-fail-recursion.err.exp similarity index 100% rename from tests/functional/lang/eval-fail-recursion.err.exp rename to src/nix-functional-tests/lang/eval-fail-recursion.err.exp diff --git a/tests/functional/lang/eval-fail-recursion.nix b/src/nix-functional-tests/lang/eval-fail-recursion.nix similarity index 100% rename from tests/functional/lang/eval-fail-recursion.nix rename to src/nix-functional-tests/lang/eval-fail-recursion.nix diff --git a/tests/functional/lang/eval-fail-remove.err.exp b/src/nix-functional-tests/lang/eval-fail-remove.err.exp similarity index 100% rename from tests/functional/lang/eval-fail-remove.err.exp rename to src/nix-functional-tests/lang/eval-fail-remove.err.exp diff --git a/tests/functional/lang/eval-fail-remove.nix b/src/nix-functional-tests/lang/eval-fail-remove.nix similarity index 100% rename from tests/functional/lang/eval-fail-remove.nix rename to src/nix-functional-tests/lang/eval-fail-remove.nix diff --git a/tests/functional/lang/eval-fail-scope-5.err.exp b/src/nix-functional-tests/lang/eval-fail-scope-5.err.exp similarity index 100% rename from tests/functional/lang/eval-fail-scope-5.err.exp rename to src/nix-functional-tests/lang/eval-fail-scope-5.err.exp diff --git a/tests/functional/lang/eval-fail-scope-5.nix b/src/nix-functional-tests/lang/eval-fail-scope-5.nix similarity index 100% rename from tests/functional/lang/eval-fail-scope-5.nix rename to src/nix-functional-tests/lang/eval-fail-scope-5.nix diff --git a/tests/functional/lang/eval-fail-seq.err.exp b/src/nix-functional-tests/lang/eval-fail-seq.err.exp similarity index 100% rename from tests/functional/lang/eval-fail-seq.err.exp rename to src/nix-functional-tests/lang/eval-fail-seq.err.exp diff --git a/tests/functional/lang/eval-fail-seq.nix b/src/nix-functional-tests/lang/eval-fail-seq.nix similarity index 100% rename from tests/functional/lang/eval-fail-seq.nix rename to src/nix-functional-tests/lang/eval-fail-seq.nix diff --git a/tests/functional/lang/eval-fail-set-override.err.exp b/src/nix-functional-tests/lang/eval-fail-set-override.err.exp similarity index 100% rename from tests/functional/lang/eval-fail-set-override.err.exp rename to src/nix-functional-tests/lang/eval-fail-set-override.err.exp diff --git a/tests/functional/lang/eval-fail-set-override.nix b/src/nix-functional-tests/lang/eval-fail-set-override.nix similarity index 100% rename from tests/functional/lang/eval-fail-set-override.nix rename to src/nix-functional-tests/lang/eval-fail-set-override.nix diff --git a/tests/functional/lang/eval-fail-set.err.exp b/src/nix-functional-tests/lang/eval-fail-set.err.exp similarity index 100% rename from tests/functional/lang/eval-fail-set.err.exp rename to src/nix-functional-tests/lang/eval-fail-set.err.exp diff --git a/tests/functional/lang/eval-fail-set.nix b/src/nix-functional-tests/lang/eval-fail-set.nix similarity index 100% rename from tests/functional/lang/eval-fail-set.nix rename to src/nix-functional-tests/lang/eval-fail-set.nix diff --git a/tests/functional/lang/eval-fail-substring.err.exp b/src/nix-functional-tests/lang/eval-fail-substring.err.exp similarity index 100% rename from tests/functional/lang/eval-fail-substring.err.exp rename to src/nix-functional-tests/lang/eval-fail-substring.err.exp diff --git a/tests/functional/lang/eval-fail-substring.nix b/src/nix-functional-tests/lang/eval-fail-substring.nix similarity index 100% rename from tests/functional/lang/eval-fail-substring.nix rename to src/nix-functional-tests/lang/eval-fail-substring.nix diff --git a/tests/functional/lang/eval-fail-to-path.err.exp b/src/nix-functional-tests/lang/eval-fail-to-path.err.exp similarity index 100% rename from tests/functional/lang/eval-fail-to-path.err.exp rename to src/nix-functional-tests/lang/eval-fail-to-path.err.exp diff --git a/tests/functional/lang/eval-fail-to-path.nix b/src/nix-functional-tests/lang/eval-fail-to-path.nix similarity index 100% rename from tests/functional/lang/eval-fail-to-path.nix rename to src/nix-functional-tests/lang/eval-fail-to-path.nix diff --git a/tests/functional/lang/eval-fail-toJSON.err.exp b/src/nix-functional-tests/lang/eval-fail-toJSON.err.exp similarity index 100% rename from tests/functional/lang/eval-fail-toJSON.err.exp rename to src/nix-functional-tests/lang/eval-fail-toJSON.err.exp diff --git a/tests/functional/lang/eval-fail-toJSON.nix b/src/nix-functional-tests/lang/eval-fail-toJSON.nix similarity index 100% rename from tests/functional/lang/eval-fail-toJSON.nix rename to src/nix-functional-tests/lang/eval-fail-toJSON.nix diff --git a/tests/functional/lang/eval-fail-undeclared-arg.err.exp b/src/nix-functional-tests/lang/eval-fail-undeclared-arg.err.exp similarity index 100% rename from tests/functional/lang/eval-fail-undeclared-arg.err.exp rename to src/nix-functional-tests/lang/eval-fail-undeclared-arg.err.exp diff --git a/tests/functional/lang/eval-fail-undeclared-arg.nix b/src/nix-functional-tests/lang/eval-fail-undeclared-arg.nix similarity index 100% rename from tests/functional/lang/eval-fail-undeclared-arg.nix rename to src/nix-functional-tests/lang/eval-fail-undeclared-arg.nix diff --git a/tests/functional/lang/eval-fail-using-set-as-attr-name.err.exp b/src/nix-functional-tests/lang/eval-fail-using-set-as-attr-name.err.exp similarity index 100% rename from tests/functional/lang/eval-fail-using-set-as-attr-name.err.exp rename to src/nix-functional-tests/lang/eval-fail-using-set-as-attr-name.err.exp diff --git a/tests/functional/lang/eval-fail-using-set-as-attr-name.nix b/src/nix-functional-tests/lang/eval-fail-using-set-as-attr-name.nix similarity index 100% rename from tests/functional/lang/eval-fail-using-set-as-attr-name.nix rename to src/nix-functional-tests/lang/eval-fail-using-set-as-attr-name.nix diff --git a/tests/functional/lang/eval-okay-any-all.exp b/src/nix-functional-tests/lang/eval-okay-any-all.exp similarity index 100% rename from tests/functional/lang/eval-okay-any-all.exp rename to src/nix-functional-tests/lang/eval-okay-any-all.exp diff --git a/tests/functional/lang/eval-okay-any-all.nix b/src/nix-functional-tests/lang/eval-okay-any-all.nix similarity index 100% rename from tests/functional/lang/eval-okay-any-all.nix rename to src/nix-functional-tests/lang/eval-okay-any-all.nix diff --git a/tests/functional/lang/eval-okay-arithmetic.exp b/src/nix-functional-tests/lang/eval-okay-arithmetic.exp similarity index 100% rename from tests/functional/lang/eval-okay-arithmetic.exp rename to src/nix-functional-tests/lang/eval-okay-arithmetic.exp diff --git a/tests/functional/lang/eval-okay-arithmetic.nix b/src/nix-functional-tests/lang/eval-okay-arithmetic.nix similarity index 100% rename from tests/functional/lang/eval-okay-arithmetic.nix rename to src/nix-functional-tests/lang/eval-okay-arithmetic.nix diff --git a/tests/functional/lang/eval-okay-attrnames.exp b/src/nix-functional-tests/lang/eval-okay-attrnames.exp similarity index 100% rename from tests/functional/lang/eval-okay-attrnames.exp rename to src/nix-functional-tests/lang/eval-okay-attrnames.exp diff --git a/tests/functional/lang/eval-okay-attrnames.nix b/src/nix-functional-tests/lang/eval-okay-attrnames.nix similarity index 100% rename from tests/functional/lang/eval-okay-attrnames.nix rename to src/nix-functional-tests/lang/eval-okay-attrnames.nix diff --git a/tests/functional/lang/eval-okay-attrs.exp b/src/nix-functional-tests/lang/eval-okay-attrs.exp similarity index 100% rename from tests/functional/lang/eval-okay-attrs.exp rename to src/nix-functional-tests/lang/eval-okay-attrs.exp diff --git a/tests/functional/lang/eval-okay-attrs.nix b/src/nix-functional-tests/lang/eval-okay-attrs.nix similarity index 100% rename from tests/functional/lang/eval-okay-attrs.nix rename to src/nix-functional-tests/lang/eval-okay-attrs.nix diff --git a/tests/functional/lang/eval-okay-attrs2.exp b/src/nix-functional-tests/lang/eval-okay-attrs2.exp similarity index 100% rename from tests/functional/lang/eval-okay-attrs2.exp rename to src/nix-functional-tests/lang/eval-okay-attrs2.exp diff --git a/tests/functional/lang/eval-okay-attrs2.nix b/src/nix-functional-tests/lang/eval-okay-attrs2.nix similarity index 100% rename from tests/functional/lang/eval-okay-attrs2.nix rename to src/nix-functional-tests/lang/eval-okay-attrs2.nix diff --git a/tests/functional/lang/eval-okay-attrs3.exp b/src/nix-functional-tests/lang/eval-okay-attrs3.exp similarity index 100% rename from tests/functional/lang/eval-okay-attrs3.exp rename to src/nix-functional-tests/lang/eval-okay-attrs3.exp diff --git a/tests/functional/lang/eval-okay-attrs3.nix b/src/nix-functional-tests/lang/eval-okay-attrs3.nix similarity index 100% rename from tests/functional/lang/eval-okay-attrs3.nix rename to src/nix-functional-tests/lang/eval-okay-attrs3.nix diff --git a/tests/functional/lang/eval-okay-attrs4.exp b/src/nix-functional-tests/lang/eval-okay-attrs4.exp similarity index 100% rename from tests/functional/lang/eval-okay-attrs4.exp rename to src/nix-functional-tests/lang/eval-okay-attrs4.exp diff --git a/tests/functional/lang/eval-okay-attrs4.nix b/src/nix-functional-tests/lang/eval-okay-attrs4.nix similarity index 100% rename from tests/functional/lang/eval-okay-attrs4.nix rename to src/nix-functional-tests/lang/eval-okay-attrs4.nix diff --git a/tests/functional/lang/eval-okay-attrs5.exp b/src/nix-functional-tests/lang/eval-okay-attrs5.exp similarity index 100% rename from tests/functional/lang/eval-okay-attrs5.exp rename to src/nix-functional-tests/lang/eval-okay-attrs5.exp diff --git a/tests/functional/lang/eval-okay-attrs5.nix b/src/nix-functional-tests/lang/eval-okay-attrs5.nix similarity index 100% rename from tests/functional/lang/eval-okay-attrs5.nix rename to src/nix-functional-tests/lang/eval-okay-attrs5.nix diff --git a/tests/functional/lang/eval-okay-attrs6.exp b/src/nix-functional-tests/lang/eval-okay-attrs6.exp similarity index 100% rename from tests/functional/lang/eval-okay-attrs6.exp rename to src/nix-functional-tests/lang/eval-okay-attrs6.exp diff --git a/tests/functional/lang/eval-okay-attrs6.nix b/src/nix-functional-tests/lang/eval-okay-attrs6.nix similarity index 100% rename from tests/functional/lang/eval-okay-attrs6.nix rename to src/nix-functional-tests/lang/eval-okay-attrs6.nix diff --git a/tests/functional/lang/eval-okay-autoargs.exp b/src/nix-functional-tests/lang/eval-okay-autoargs.exp similarity index 100% rename from tests/functional/lang/eval-okay-autoargs.exp rename to src/nix-functional-tests/lang/eval-okay-autoargs.exp diff --git a/tests/functional/lang/eval-okay-autoargs.flags b/src/nix-functional-tests/lang/eval-okay-autoargs.flags similarity index 100% rename from tests/functional/lang/eval-okay-autoargs.flags rename to src/nix-functional-tests/lang/eval-okay-autoargs.flags diff --git a/tests/functional/lang/eval-okay-autoargs.nix b/src/nix-functional-tests/lang/eval-okay-autoargs.nix similarity index 100% rename from tests/functional/lang/eval-okay-autoargs.nix rename to src/nix-functional-tests/lang/eval-okay-autoargs.nix diff --git a/tests/functional/lang/eval-okay-backslash-newline-1.exp b/src/nix-functional-tests/lang/eval-okay-backslash-newline-1.exp similarity index 100% rename from tests/functional/lang/eval-okay-backslash-newline-1.exp rename to src/nix-functional-tests/lang/eval-okay-backslash-newline-1.exp diff --git a/tests/functional/lang/eval-okay-backslash-newline-1.nix b/src/nix-functional-tests/lang/eval-okay-backslash-newline-1.nix similarity index 100% rename from tests/functional/lang/eval-okay-backslash-newline-1.nix rename to src/nix-functional-tests/lang/eval-okay-backslash-newline-1.nix diff --git a/tests/functional/lang/eval-okay-backslash-newline-2.exp b/src/nix-functional-tests/lang/eval-okay-backslash-newline-2.exp similarity index 100% rename from tests/functional/lang/eval-okay-backslash-newline-2.exp rename to src/nix-functional-tests/lang/eval-okay-backslash-newline-2.exp diff --git a/tests/functional/lang/eval-okay-backslash-newline-2.nix b/src/nix-functional-tests/lang/eval-okay-backslash-newline-2.nix similarity index 100% rename from tests/functional/lang/eval-okay-backslash-newline-2.nix rename to src/nix-functional-tests/lang/eval-okay-backslash-newline-2.nix diff --git a/tests/functional/lang/eval-okay-baseNameOf.exp b/src/nix-functional-tests/lang/eval-okay-baseNameOf.exp similarity index 100% rename from tests/functional/lang/eval-okay-baseNameOf.exp rename to src/nix-functional-tests/lang/eval-okay-baseNameOf.exp diff --git a/tests/functional/lang/eval-okay-baseNameOf.nix b/src/nix-functional-tests/lang/eval-okay-baseNameOf.nix similarity index 100% rename from tests/functional/lang/eval-okay-baseNameOf.nix rename to src/nix-functional-tests/lang/eval-okay-baseNameOf.nix diff --git a/tests/functional/lang/eval-okay-builtins-add.exp b/src/nix-functional-tests/lang/eval-okay-builtins-add.exp similarity index 100% rename from tests/functional/lang/eval-okay-builtins-add.exp rename to src/nix-functional-tests/lang/eval-okay-builtins-add.exp diff --git a/tests/functional/lang/eval-okay-builtins-add.nix b/src/nix-functional-tests/lang/eval-okay-builtins-add.nix similarity index 100% rename from tests/functional/lang/eval-okay-builtins-add.nix rename to src/nix-functional-tests/lang/eval-okay-builtins-add.nix diff --git a/tests/functional/lang/eval-okay-builtins.exp b/src/nix-functional-tests/lang/eval-okay-builtins.exp similarity index 100% rename from tests/functional/lang/eval-okay-builtins.exp rename to src/nix-functional-tests/lang/eval-okay-builtins.exp diff --git a/tests/functional/lang/eval-okay-builtins.nix b/src/nix-functional-tests/lang/eval-okay-builtins.nix similarity index 100% rename from tests/functional/lang/eval-okay-builtins.nix rename to src/nix-functional-tests/lang/eval-okay-builtins.nix diff --git a/tests/functional/lang/eval-okay-callable-attrs.exp b/src/nix-functional-tests/lang/eval-okay-callable-attrs.exp similarity index 100% rename from tests/functional/lang/eval-okay-callable-attrs.exp rename to src/nix-functional-tests/lang/eval-okay-callable-attrs.exp diff --git a/tests/functional/lang/eval-okay-callable-attrs.nix b/src/nix-functional-tests/lang/eval-okay-callable-attrs.nix similarity index 100% rename from tests/functional/lang/eval-okay-callable-attrs.nix rename to src/nix-functional-tests/lang/eval-okay-callable-attrs.nix diff --git a/tests/functional/lang/eval-okay-catattrs.exp b/src/nix-functional-tests/lang/eval-okay-catattrs.exp similarity index 100% rename from tests/functional/lang/eval-okay-catattrs.exp rename to src/nix-functional-tests/lang/eval-okay-catattrs.exp diff --git a/tests/functional/lang/eval-okay-catattrs.nix b/src/nix-functional-tests/lang/eval-okay-catattrs.nix similarity index 100% rename from tests/functional/lang/eval-okay-catattrs.nix rename to src/nix-functional-tests/lang/eval-okay-catattrs.nix diff --git a/tests/functional/lang/eval-okay-closure.exp b/src/nix-functional-tests/lang/eval-okay-closure.exp similarity index 100% rename from tests/functional/lang/eval-okay-closure.exp rename to src/nix-functional-tests/lang/eval-okay-closure.exp diff --git a/tests/functional/lang/eval-okay-closure.exp.xml b/src/nix-functional-tests/lang/eval-okay-closure.exp.xml similarity index 100% rename from tests/functional/lang/eval-okay-closure.exp.xml rename to src/nix-functional-tests/lang/eval-okay-closure.exp.xml diff --git a/tests/functional/lang/eval-okay-closure.nix b/src/nix-functional-tests/lang/eval-okay-closure.nix similarity index 100% rename from tests/functional/lang/eval-okay-closure.nix rename to src/nix-functional-tests/lang/eval-okay-closure.nix diff --git a/tests/functional/lang/eval-okay-comments.exp b/src/nix-functional-tests/lang/eval-okay-comments.exp similarity index 100% rename from tests/functional/lang/eval-okay-comments.exp rename to src/nix-functional-tests/lang/eval-okay-comments.exp diff --git a/tests/functional/lang/eval-okay-comments.nix b/src/nix-functional-tests/lang/eval-okay-comments.nix similarity index 100% rename from tests/functional/lang/eval-okay-comments.nix rename to src/nix-functional-tests/lang/eval-okay-comments.nix diff --git a/tests/functional/lang/eval-okay-concat.exp b/src/nix-functional-tests/lang/eval-okay-concat.exp similarity index 100% rename from tests/functional/lang/eval-okay-concat.exp rename to src/nix-functional-tests/lang/eval-okay-concat.exp diff --git a/tests/functional/lang/eval-okay-concat.nix b/src/nix-functional-tests/lang/eval-okay-concat.nix similarity index 100% rename from tests/functional/lang/eval-okay-concat.nix rename to src/nix-functional-tests/lang/eval-okay-concat.nix diff --git a/tests/functional/lang/eval-okay-concatmap.exp b/src/nix-functional-tests/lang/eval-okay-concatmap.exp similarity index 100% rename from tests/functional/lang/eval-okay-concatmap.exp rename to src/nix-functional-tests/lang/eval-okay-concatmap.exp diff --git a/tests/functional/lang/eval-okay-concatmap.nix b/src/nix-functional-tests/lang/eval-okay-concatmap.nix similarity index 100% rename from tests/functional/lang/eval-okay-concatmap.nix rename to src/nix-functional-tests/lang/eval-okay-concatmap.nix diff --git a/tests/functional/lang/eval-okay-concatstringssep.exp b/src/nix-functional-tests/lang/eval-okay-concatstringssep.exp similarity index 100% rename from tests/functional/lang/eval-okay-concatstringssep.exp rename to src/nix-functional-tests/lang/eval-okay-concatstringssep.exp diff --git a/tests/functional/lang/eval-okay-concatstringssep.nix b/src/nix-functional-tests/lang/eval-okay-concatstringssep.nix similarity index 100% rename from tests/functional/lang/eval-okay-concatstringssep.nix rename to src/nix-functional-tests/lang/eval-okay-concatstringssep.nix diff --git a/tests/functional/lang/eval-okay-context-introspection.exp b/src/nix-functional-tests/lang/eval-okay-context-introspection.exp similarity index 100% rename from tests/functional/lang/eval-okay-context-introspection.exp rename to src/nix-functional-tests/lang/eval-okay-context-introspection.exp diff --git a/tests/functional/lang/eval-okay-context-introspection.nix b/src/nix-functional-tests/lang/eval-okay-context-introspection.nix similarity index 100% rename from tests/functional/lang/eval-okay-context-introspection.nix rename to src/nix-functional-tests/lang/eval-okay-context-introspection.nix diff --git a/tests/functional/lang/eval-okay-context.exp b/src/nix-functional-tests/lang/eval-okay-context.exp similarity index 100% rename from tests/functional/lang/eval-okay-context.exp rename to src/nix-functional-tests/lang/eval-okay-context.exp diff --git a/tests/functional/lang/eval-okay-context.nix b/src/nix-functional-tests/lang/eval-okay-context.nix similarity index 100% rename from tests/functional/lang/eval-okay-context.nix rename to src/nix-functional-tests/lang/eval-okay-context.nix diff --git a/tests/functional/lang/eval-okay-convertHash.err.exp b/src/nix-functional-tests/lang/eval-okay-convertHash.err.exp similarity index 100% rename from tests/functional/lang/eval-okay-convertHash.err.exp rename to src/nix-functional-tests/lang/eval-okay-convertHash.err.exp diff --git a/tests/functional/lang/eval-okay-convertHash.exp b/src/nix-functional-tests/lang/eval-okay-convertHash.exp similarity index 100% rename from tests/functional/lang/eval-okay-convertHash.exp rename to src/nix-functional-tests/lang/eval-okay-convertHash.exp diff --git a/tests/functional/lang/eval-okay-convertHash.nix b/src/nix-functional-tests/lang/eval-okay-convertHash.nix similarity index 100% rename from tests/functional/lang/eval-okay-convertHash.nix rename to src/nix-functional-tests/lang/eval-okay-convertHash.nix diff --git a/tests/functional/lang/eval-okay-curpos.exp b/src/nix-functional-tests/lang/eval-okay-curpos.exp similarity index 100% rename from tests/functional/lang/eval-okay-curpos.exp rename to src/nix-functional-tests/lang/eval-okay-curpos.exp diff --git a/tests/functional/lang/eval-okay-curpos.nix b/src/nix-functional-tests/lang/eval-okay-curpos.nix similarity index 100% rename from tests/functional/lang/eval-okay-curpos.nix rename to src/nix-functional-tests/lang/eval-okay-curpos.nix diff --git a/tests/functional/lang/eval-okay-deepseq.exp b/src/nix-functional-tests/lang/eval-okay-deepseq.exp similarity index 100% rename from tests/functional/lang/eval-okay-deepseq.exp rename to src/nix-functional-tests/lang/eval-okay-deepseq.exp diff --git a/tests/functional/lang/eval-okay-deepseq.nix b/src/nix-functional-tests/lang/eval-okay-deepseq.nix similarity index 100% rename from tests/functional/lang/eval-okay-deepseq.nix rename to src/nix-functional-tests/lang/eval-okay-deepseq.nix diff --git a/tests/functional/lang/eval-okay-delayed-with-inherit.exp b/src/nix-functional-tests/lang/eval-okay-delayed-with-inherit.exp similarity index 100% rename from tests/functional/lang/eval-okay-delayed-with-inherit.exp rename to src/nix-functional-tests/lang/eval-okay-delayed-with-inherit.exp diff --git a/tests/functional/lang/eval-okay-delayed-with-inherit.nix b/src/nix-functional-tests/lang/eval-okay-delayed-with-inherit.nix similarity index 100% rename from tests/functional/lang/eval-okay-delayed-with-inherit.nix rename to src/nix-functional-tests/lang/eval-okay-delayed-with-inherit.nix diff --git a/tests/functional/lang/eval-okay-delayed-with.exp b/src/nix-functional-tests/lang/eval-okay-delayed-with.exp similarity index 100% rename from tests/functional/lang/eval-okay-delayed-with.exp rename to src/nix-functional-tests/lang/eval-okay-delayed-with.exp diff --git a/tests/functional/lang/eval-okay-delayed-with.nix b/src/nix-functional-tests/lang/eval-okay-delayed-with.nix similarity index 100% rename from tests/functional/lang/eval-okay-delayed-with.nix rename to src/nix-functional-tests/lang/eval-okay-delayed-with.nix diff --git a/tests/functional/lang/eval-okay-deprecate-cursed-or.err.exp b/src/nix-functional-tests/lang/eval-okay-deprecate-cursed-or.err.exp similarity index 100% rename from tests/functional/lang/eval-okay-deprecate-cursed-or.err.exp rename to src/nix-functional-tests/lang/eval-okay-deprecate-cursed-or.err.exp diff --git a/tests/functional/lang/eval-okay-deprecate-cursed-or.exp b/src/nix-functional-tests/lang/eval-okay-deprecate-cursed-or.exp similarity index 100% rename from tests/functional/lang/eval-okay-deprecate-cursed-or.exp rename to src/nix-functional-tests/lang/eval-okay-deprecate-cursed-or.exp diff --git a/tests/functional/lang/eval-okay-deprecate-cursed-or.nix b/src/nix-functional-tests/lang/eval-okay-deprecate-cursed-or.nix similarity index 100% rename from tests/functional/lang/eval-okay-deprecate-cursed-or.nix rename to src/nix-functional-tests/lang/eval-okay-deprecate-cursed-or.nix diff --git a/tests/functional/lang/eval-okay-derivation-legacy.err.exp b/src/nix-functional-tests/lang/eval-okay-derivation-legacy.err.exp similarity index 100% rename from tests/functional/lang/eval-okay-derivation-legacy.err.exp rename to src/nix-functional-tests/lang/eval-okay-derivation-legacy.err.exp diff --git a/tests/functional/lang/eval-okay-derivation-legacy.exp b/src/nix-functional-tests/lang/eval-okay-derivation-legacy.exp similarity index 100% rename from tests/functional/lang/eval-okay-derivation-legacy.exp rename to src/nix-functional-tests/lang/eval-okay-derivation-legacy.exp diff --git a/tests/functional/lang/eval-okay-derivation-legacy.nix b/src/nix-functional-tests/lang/eval-okay-derivation-legacy.nix similarity index 100% rename from tests/functional/lang/eval-okay-derivation-legacy.nix rename to src/nix-functional-tests/lang/eval-okay-derivation-legacy.nix diff --git a/tests/functional/lang/eval-okay-dynamic-attrs-2.exp b/src/nix-functional-tests/lang/eval-okay-dynamic-attrs-2.exp similarity index 100% rename from tests/functional/lang/eval-okay-dynamic-attrs-2.exp rename to src/nix-functional-tests/lang/eval-okay-dynamic-attrs-2.exp diff --git a/tests/functional/lang/eval-okay-dynamic-attrs-2.nix b/src/nix-functional-tests/lang/eval-okay-dynamic-attrs-2.nix similarity index 100% rename from tests/functional/lang/eval-okay-dynamic-attrs-2.nix rename to src/nix-functional-tests/lang/eval-okay-dynamic-attrs-2.nix diff --git a/tests/functional/lang/eval-okay-dynamic-attrs-bare.exp b/src/nix-functional-tests/lang/eval-okay-dynamic-attrs-bare.exp similarity index 100% rename from tests/functional/lang/eval-okay-dynamic-attrs-bare.exp rename to src/nix-functional-tests/lang/eval-okay-dynamic-attrs-bare.exp diff --git a/tests/functional/lang/eval-okay-dynamic-attrs-bare.nix b/src/nix-functional-tests/lang/eval-okay-dynamic-attrs-bare.nix similarity index 100% rename from tests/functional/lang/eval-okay-dynamic-attrs-bare.nix rename to src/nix-functional-tests/lang/eval-okay-dynamic-attrs-bare.nix diff --git a/tests/functional/lang/eval-okay-dynamic-attrs.exp b/src/nix-functional-tests/lang/eval-okay-dynamic-attrs.exp similarity index 100% rename from tests/functional/lang/eval-okay-dynamic-attrs.exp rename to src/nix-functional-tests/lang/eval-okay-dynamic-attrs.exp diff --git a/tests/functional/lang/eval-okay-dynamic-attrs.nix b/src/nix-functional-tests/lang/eval-okay-dynamic-attrs.nix similarity index 100% rename from tests/functional/lang/eval-okay-dynamic-attrs.nix rename to src/nix-functional-tests/lang/eval-okay-dynamic-attrs.nix diff --git a/tests/functional/lang/eval-okay-elem.exp b/src/nix-functional-tests/lang/eval-okay-elem.exp similarity index 100% rename from tests/functional/lang/eval-okay-elem.exp rename to src/nix-functional-tests/lang/eval-okay-elem.exp diff --git a/tests/functional/lang/eval-okay-elem.nix b/src/nix-functional-tests/lang/eval-okay-elem.nix similarity index 100% rename from tests/functional/lang/eval-okay-elem.nix rename to src/nix-functional-tests/lang/eval-okay-elem.nix diff --git a/tests/functional/lang/eval-okay-empty-args.exp b/src/nix-functional-tests/lang/eval-okay-empty-args.exp similarity index 100% rename from tests/functional/lang/eval-okay-empty-args.exp rename to src/nix-functional-tests/lang/eval-okay-empty-args.exp diff --git a/tests/functional/lang/eval-okay-empty-args.nix b/src/nix-functional-tests/lang/eval-okay-empty-args.nix similarity index 100% rename from tests/functional/lang/eval-okay-empty-args.nix rename to src/nix-functional-tests/lang/eval-okay-empty-args.nix diff --git a/tests/functional/lang/eval-okay-eq-derivations.exp b/src/nix-functional-tests/lang/eval-okay-eq-derivations.exp similarity index 100% rename from tests/functional/lang/eval-okay-eq-derivations.exp rename to src/nix-functional-tests/lang/eval-okay-eq-derivations.exp diff --git a/tests/functional/lang/eval-okay-eq-derivations.nix b/src/nix-functional-tests/lang/eval-okay-eq-derivations.nix similarity index 100% rename from tests/functional/lang/eval-okay-eq-derivations.nix rename to src/nix-functional-tests/lang/eval-okay-eq-derivations.nix diff --git a/tests/functional/lang/eval-okay-eq.exp b/src/nix-functional-tests/lang/eval-okay-eq.exp similarity index 100% rename from tests/functional/lang/eval-okay-eq.exp rename to src/nix-functional-tests/lang/eval-okay-eq.exp diff --git a/tests/functional/lang/eval-okay-eq.nix b/src/nix-functional-tests/lang/eval-okay-eq.nix similarity index 100% rename from tests/functional/lang/eval-okay-eq.nix rename to src/nix-functional-tests/lang/eval-okay-eq.nix diff --git a/tests/functional/lang/eval-okay-filter.exp b/src/nix-functional-tests/lang/eval-okay-filter.exp similarity index 100% rename from tests/functional/lang/eval-okay-filter.exp rename to src/nix-functional-tests/lang/eval-okay-filter.exp diff --git a/tests/functional/lang/eval-okay-filter.nix b/src/nix-functional-tests/lang/eval-okay-filter.nix similarity index 100% rename from tests/functional/lang/eval-okay-filter.nix rename to src/nix-functional-tests/lang/eval-okay-filter.nix diff --git a/tests/functional/lang/eval-okay-flake-ref-to-string.exp b/src/nix-functional-tests/lang/eval-okay-flake-ref-to-string.exp similarity index 100% rename from tests/functional/lang/eval-okay-flake-ref-to-string.exp rename to src/nix-functional-tests/lang/eval-okay-flake-ref-to-string.exp diff --git a/tests/functional/lang/eval-okay-flake-ref-to-string.nix b/src/nix-functional-tests/lang/eval-okay-flake-ref-to-string.nix similarity index 100% rename from tests/functional/lang/eval-okay-flake-ref-to-string.nix rename to src/nix-functional-tests/lang/eval-okay-flake-ref-to-string.nix diff --git a/tests/functional/lang/eval-okay-flatten.exp b/src/nix-functional-tests/lang/eval-okay-flatten.exp similarity index 100% rename from tests/functional/lang/eval-okay-flatten.exp rename to src/nix-functional-tests/lang/eval-okay-flatten.exp diff --git a/tests/functional/lang/eval-okay-flatten.nix b/src/nix-functional-tests/lang/eval-okay-flatten.nix similarity index 100% rename from tests/functional/lang/eval-okay-flatten.nix rename to src/nix-functional-tests/lang/eval-okay-flatten.nix diff --git a/tests/functional/lang/eval-okay-float.exp b/src/nix-functional-tests/lang/eval-okay-float.exp similarity index 100% rename from tests/functional/lang/eval-okay-float.exp rename to src/nix-functional-tests/lang/eval-okay-float.exp diff --git a/tests/functional/lang/eval-okay-float.nix b/src/nix-functional-tests/lang/eval-okay-float.nix similarity index 100% rename from tests/functional/lang/eval-okay-float.nix rename to src/nix-functional-tests/lang/eval-okay-float.nix diff --git a/tests/functional/lang/eval-okay-floor-ceil.exp b/src/nix-functional-tests/lang/eval-okay-floor-ceil.exp similarity index 100% rename from tests/functional/lang/eval-okay-floor-ceil.exp rename to src/nix-functional-tests/lang/eval-okay-floor-ceil.exp diff --git a/tests/functional/lang/eval-okay-floor-ceil.nix b/src/nix-functional-tests/lang/eval-okay-floor-ceil.nix similarity index 100% rename from tests/functional/lang/eval-okay-floor-ceil.nix rename to src/nix-functional-tests/lang/eval-okay-floor-ceil.nix diff --git a/tests/functional/lang/eval-okay-foldlStrict-lazy-elements.exp b/src/nix-functional-tests/lang/eval-okay-foldlStrict-lazy-elements.exp similarity index 100% rename from tests/functional/lang/eval-okay-foldlStrict-lazy-elements.exp rename to src/nix-functional-tests/lang/eval-okay-foldlStrict-lazy-elements.exp diff --git a/tests/functional/lang/eval-okay-foldlStrict-lazy-elements.nix b/src/nix-functional-tests/lang/eval-okay-foldlStrict-lazy-elements.nix similarity index 100% rename from tests/functional/lang/eval-okay-foldlStrict-lazy-elements.nix rename to src/nix-functional-tests/lang/eval-okay-foldlStrict-lazy-elements.nix diff --git a/tests/functional/lang/eval-okay-foldlStrict-lazy-initial-accumulator.exp b/src/nix-functional-tests/lang/eval-okay-foldlStrict-lazy-initial-accumulator.exp similarity index 100% rename from tests/functional/lang/eval-okay-foldlStrict-lazy-initial-accumulator.exp rename to src/nix-functional-tests/lang/eval-okay-foldlStrict-lazy-initial-accumulator.exp diff --git a/tests/functional/lang/eval-okay-foldlStrict-lazy-initial-accumulator.nix b/src/nix-functional-tests/lang/eval-okay-foldlStrict-lazy-initial-accumulator.nix similarity index 100% rename from tests/functional/lang/eval-okay-foldlStrict-lazy-initial-accumulator.nix rename to src/nix-functional-tests/lang/eval-okay-foldlStrict-lazy-initial-accumulator.nix diff --git a/tests/functional/lang/eval-okay-foldlStrict.exp b/src/nix-functional-tests/lang/eval-okay-foldlStrict.exp similarity index 100% rename from tests/functional/lang/eval-okay-foldlStrict.exp rename to src/nix-functional-tests/lang/eval-okay-foldlStrict.exp diff --git a/tests/functional/lang/eval-okay-foldlStrict.nix b/src/nix-functional-tests/lang/eval-okay-foldlStrict.nix similarity index 100% rename from tests/functional/lang/eval-okay-foldlStrict.nix rename to src/nix-functional-tests/lang/eval-okay-foldlStrict.nix diff --git a/tests/functional/lang/eval-okay-fromTOML-timestamps.exp b/src/nix-functional-tests/lang/eval-okay-fromTOML-timestamps.exp similarity index 100% rename from tests/functional/lang/eval-okay-fromTOML-timestamps.exp rename to src/nix-functional-tests/lang/eval-okay-fromTOML-timestamps.exp diff --git a/tests/functional/lang/eval-okay-fromTOML-timestamps.flags b/src/nix-functional-tests/lang/eval-okay-fromTOML-timestamps.flags similarity index 100% rename from tests/functional/lang/eval-okay-fromTOML-timestamps.flags rename to src/nix-functional-tests/lang/eval-okay-fromTOML-timestamps.flags diff --git a/tests/functional/lang/eval-okay-fromTOML-timestamps.nix b/src/nix-functional-tests/lang/eval-okay-fromTOML-timestamps.nix similarity index 100% rename from tests/functional/lang/eval-okay-fromTOML-timestamps.nix rename to src/nix-functional-tests/lang/eval-okay-fromTOML-timestamps.nix diff --git a/tests/functional/lang/eval-okay-fromTOML.exp b/src/nix-functional-tests/lang/eval-okay-fromTOML.exp similarity index 100% rename from tests/functional/lang/eval-okay-fromTOML.exp rename to src/nix-functional-tests/lang/eval-okay-fromTOML.exp diff --git a/tests/functional/lang/eval-okay-fromTOML.nix b/src/nix-functional-tests/lang/eval-okay-fromTOML.nix similarity index 100% rename from tests/functional/lang/eval-okay-fromTOML.nix rename to src/nix-functional-tests/lang/eval-okay-fromTOML.nix diff --git a/tests/functional/lang/eval-okay-fromjson-escapes.exp b/src/nix-functional-tests/lang/eval-okay-fromjson-escapes.exp similarity index 100% rename from tests/functional/lang/eval-okay-fromjson-escapes.exp rename to src/nix-functional-tests/lang/eval-okay-fromjson-escapes.exp diff --git a/tests/functional/lang/eval-okay-fromjson-escapes.nix b/src/nix-functional-tests/lang/eval-okay-fromjson-escapes.nix similarity index 100% rename from tests/functional/lang/eval-okay-fromjson-escapes.nix rename to src/nix-functional-tests/lang/eval-okay-fromjson-escapes.nix diff --git a/tests/functional/lang/eval-okay-fromjson.exp b/src/nix-functional-tests/lang/eval-okay-fromjson.exp similarity index 100% rename from tests/functional/lang/eval-okay-fromjson.exp rename to src/nix-functional-tests/lang/eval-okay-fromjson.exp diff --git a/tests/functional/lang/eval-okay-fromjson.nix b/src/nix-functional-tests/lang/eval-okay-fromjson.nix similarity index 100% rename from tests/functional/lang/eval-okay-fromjson.nix rename to src/nix-functional-tests/lang/eval-okay-fromjson.nix diff --git a/tests/functional/lang/eval-okay-functionargs.exp b/src/nix-functional-tests/lang/eval-okay-functionargs.exp similarity index 100% rename from tests/functional/lang/eval-okay-functionargs.exp rename to src/nix-functional-tests/lang/eval-okay-functionargs.exp diff --git a/tests/functional/lang/eval-okay-functionargs.exp.xml b/src/nix-functional-tests/lang/eval-okay-functionargs.exp.xml similarity index 100% rename from tests/functional/lang/eval-okay-functionargs.exp.xml rename to src/nix-functional-tests/lang/eval-okay-functionargs.exp.xml diff --git a/tests/functional/lang/eval-okay-functionargs.nix b/src/nix-functional-tests/lang/eval-okay-functionargs.nix similarity index 100% rename from tests/functional/lang/eval-okay-functionargs.nix rename to src/nix-functional-tests/lang/eval-okay-functionargs.nix diff --git a/tests/functional/lang/eval-okay-getattrpos-functionargs.exp b/src/nix-functional-tests/lang/eval-okay-getattrpos-functionargs.exp similarity index 100% rename from tests/functional/lang/eval-okay-getattrpos-functionargs.exp rename to src/nix-functional-tests/lang/eval-okay-getattrpos-functionargs.exp diff --git a/tests/functional/lang/eval-okay-getattrpos-functionargs.nix b/src/nix-functional-tests/lang/eval-okay-getattrpos-functionargs.nix similarity index 100% rename from tests/functional/lang/eval-okay-getattrpos-functionargs.nix rename to src/nix-functional-tests/lang/eval-okay-getattrpos-functionargs.nix diff --git a/tests/functional/lang/eval-okay-getattrpos-undefined.exp b/src/nix-functional-tests/lang/eval-okay-getattrpos-undefined.exp similarity index 100% rename from tests/functional/lang/eval-okay-getattrpos-undefined.exp rename to src/nix-functional-tests/lang/eval-okay-getattrpos-undefined.exp diff --git a/tests/functional/lang/eval-okay-getattrpos-undefined.nix b/src/nix-functional-tests/lang/eval-okay-getattrpos-undefined.nix similarity index 100% rename from tests/functional/lang/eval-okay-getattrpos-undefined.nix rename to src/nix-functional-tests/lang/eval-okay-getattrpos-undefined.nix diff --git a/tests/functional/lang/eval-okay-getattrpos.exp b/src/nix-functional-tests/lang/eval-okay-getattrpos.exp similarity index 100% rename from tests/functional/lang/eval-okay-getattrpos.exp rename to src/nix-functional-tests/lang/eval-okay-getattrpos.exp diff --git a/tests/functional/lang/eval-okay-getattrpos.nix b/src/nix-functional-tests/lang/eval-okay-getattrpos.nix similarity index 100% rename from tests/functional/lang/eval-okay-getattrpos.nix rename to src/nix-functional-tests/lang/eval-okay-getattrpos.nix diff --git a/tests/functional/lang/eval-okay-getenv.exp b/src/nix-functional-tests/lang/eval-okay-getenv.exp similarity index 100% rename from tests/functional/lang/eval-okay-getenv.exp rename to src/nix-functional-tests/lang/eval-okay-getenv.exp diff --git a/tests/functional/lang/eval-okay-getenv.nix b/src/nix-functional-tests/lang/eval-okay-getenv.nix similarity index 100% rename from tests/functional/lang/eval-okay-getenv.nix rename to src/nix-functional-tests/lang/eval-okay-getenv.nix diff --git a/tests/functional/lang/eval-okay-groupBy.exp b/src/nix-functional-tests/lang/eval-okay-groupBy.exp similarity index 100% rename from tests/functional/lang/eval-okay-groupBy.exp rename to src/nix-functional-tests/lang/eval-okay-groupBy.exp diff --git a/tests/functional/lang/eval-okay-groupBy.nix b/src/nix-functional-tests/lang/eval-okay-groupBy.nix similarity index 100% rename from tests/functional/lang/eval-okay-groupBy.nix rename to src/nix-functional-tests/lang/eval-okay-groupBy.nix diff --git a/tests/functional/lang/eval-okay-hash.exp b/src/nix-functional-tests/lang/eval-okay-hash.exp similarity index 100% rename from tests/functional/lang/eval-okay-hash.exp rename to src/nix-functional-tests/lang/eval-okay-hash.exp diff --git a/tests/functional/lang/eval-okay-hashfile.exp b/src/nix-functional-tests/lang/eval-okay-hashfile.exp similarity index 100% rename from tests/functional/lang/eval-okay-hashfile.exp rename to src/nix-functional-tests/lang/eval-okay-hashfile.exp diff --git a/tests/functional/lang/eval-okay-hashfile.nix b/src/nix-functional-tests/lang/eval-okay-hashfile.nix similarity index 100% rename from tests/functional/lang/eval-okay-hashfile.nix rename to src/nix-functional-tests/lang/eval-okay-hashfile.nix diff --git a/tests/functional/lang/eval-okay-hashstring.exp b/src/nix-functional-tests/lang/eval-okay-hashstring.exp similarity index 100% rename from tests/functional/lang/eval-okay-hashstring.exp rename to src/nix-functional-tests/lang/eval-okay-hashstring.exp diff --git a/tests/functional/lang/eval-okay-hashstring.nix b/src/nix-functional-tests/lang/eval-okay-hashstring.nix similarity index 100% rename from tests/functional/lang/eval-okay-hashstring.nix rename to src/nix-functional-tests/lang/eval-okay-hashstring.nix diff --git a/tests/functional/lang/eval-okay-if.exp b/src/nix-functional-tests/lang/eval-okay-if.exp similarity index 100% rename from tests/functional/lang/eval-okay-if.exp rename to src/nix-functional-tests/lang/eval-okay-if.exp diff --git a/tests/functional/lang/eval-okay-if.nix b/src/nix-functional-tests/lang/eval-okay-if.nix similarity index 100% rename from tests/functional/lang/eval-okay-if.nix rename to src/nix-functional-tests/lang/eval-okay-if.nix diff --git a/tests/functional/lang/eval-okay-import.exp b/src/nix-functional-tests/lang/eval-okay-import.exp similarity index 100% rename from tests/functional/lang/eval-okay-import.exp rename to src/nix-functional-tests/lang/eval-okay-import.exp diff --git a/tests/functional/lang/eval-okay-import.nix b/src/nix-functional-tests/lang/eval-okay-import.nix similarity index 100% rename from tests/functional/lang/eval-okay-import.nix rename to src/nix-functional-tests/lang/eval-okay-import.nix diff --git a/tests/functional/lang/eval-okay-ind-string.exp b/src/nix-functional-tests/lang/eval-okay-ind-string.exp similarity index 100% rename from tests/functional/lang/eval-okay-ind-string.exp rename to src/nix-functional-tests/lang/eval-okay-ind-string.exp diff --git a/tests/functional/lang/eval-okay-ind-string.nix b/src/nix-functional-tests/lang/eval-okay-ind-string.nix similarity index 100% rename from tests/functional/lang/eval-okay-ind-string.nix rename to src/nix-functional-tests/lang/eval-okay-ind-string.nix diff --git a/tests/functional/lang/eval-okay-inherit-attr-pos.exp b/src/nix-functional-tests/lang/eval-okay-inherit-attr-pos.exp similarity index 100% rename from tests/functional/lang/eval-okay-inherit-attr-pos.exp rename to src/nix-functional-tests/lang/eval-okay-inherit-attr-pos.exp diff --git a/tests/functional/lang/eval-okay-inherit-attr-pos.nix b/src/nix-functional-tests/lang/eval-okay-inherit-attr-pos.nix similarity index 100% rename from tests/functional/lang/eval-okay-inherit-attr-pos.nix rename to src/nix-functional-tests/lang/eval-okay-inherit-attr-pos.nix diff --git a/tests/functional/lang/eval-okay-inherit-from.err.exp b/src/nix-functional-tests/lang/eval-okay-inherit-from.err.exp similarity index 100% rename from tests/functional/lang/eval-okay-inherit-from.err.exp rename to src/nix-functional-tests/lang/eval-okay-inherit-from.err.exp diff --git a/tests/functional/lang/eval-okay-inherit-from.exp b/src/nix-functional-tests/lang/eval-okay-inherit-from.exp similarity index 100% rename from tests/functional/lang/eval-okay-inherit-from.exp rename to src/nix-functional-tests/lang/eval-okay-inherit-from.exp diff --git a/tests/functional/lang/eval-okay-inherit-from.nix b/src/nix-functional-tests/lang/eval-okay-inherit-from.nix similarity index 100% rename from tests/functional/lang/eval-okay-inherit-from.nix rename to src/nix-functional-tests/lang/eval-okay-inherit-from.nix diff --git a/tests/functional/lang/eval-okay-intersectAttrs.exp b/src/nix-functional-tests/lang/eval-okay-intersectAttrs.exp similarity index 100% rename from tests/functional/lang/eval-okay-intersectAttrs.exp rename to src/nix-functional-tests/lang/eval-okay-intersectAttrs.exp diff --git a/tests/functional/lang/eval-okay-intersectAttrs.nix b/src/nix-functional-tests/lang/eval-okay-intersectAttrs.nix similarity index 100% rename from tests/functional/lang/eval-okay-intersectAttrs.nix rename to src/nix-functional-tests/lang/eval-okay-intersectAttrs.nix diff --git a/tests/functional/lang/eval-okay-let.exp b/src/nix-functional-tests/lang/eval-okay-let.exp similarity index 100% rename from tests/functional/lang/eval-okay-let.exp rename to src/nix-functional-tests/lang/eval-okay-let.exp diff --git a/tests/functional/lang/eval-okay-let.nix b/src/nix-functional-tests/lang/eval-okay-let.nix similarity index 100% rename from tests/functional/lang/eval-okay-let.nix rename to src/nix-functional-tests/lang/eval-okay-let.nix diff --git a/tests/functional/lang/eval-okay-list.exp b/src/nix-functional-tests/lang/eval-okay-list.exp similarity index 100% rename from tests/functional/lang/eval-okay-list.exp rename to src/nix-functional-tests/lang/eval-okay-list.exp diff --git a/tests/functional/lang/eval-okay-list.nix b/src/nix-functional-tests/lang/eval-okay-list.nix similarity index 100% rename from tests/functional/lang/eval-okay-list.nix rename to src/nix-functional-tests/lang/eval-okay-list.nix diff --git a/tests/functional/lang/eval-okay-listtoattrs.exp b/src/nix-functional-tests/lang/eval-okay-listtoattrs.exp similarity index 100% rename from tests/functional/lang/eval-okay-listtoattrs.exp rename to src/nix-functional-tests/lang/eval-okay-listtoattrs.exp diff --git a/tests/functional/lang/eval-okay-listtoattrs.nix b/src/nix-functional-tests/lang/eval-okay-listtoattrs.nix similarity index 100% rename from tests/functional/lang/eval-okay-listtoattrs.nix rename to src/nix-functional-tests/lang/eval-okay-listtoattrs.nix diff --git a/tests/functional/lang/eval-okay-logic.exp b/src/nix-functional-tests/lang/eval-okay-logic.exp similarity index 100% rename from tests/functional/lang/eval-okay-logic.exp rename to src/nix-functional-tests/lang/eval-okay-logic.exp diff --git a/tests/functional/lang/eval-okay-logic.nix b/src/nix-functional-tests/lang/eval-okay-logic.nix similarity index 100% rename from tests/functional/lang/eval-okay-logic.nix rename to src/nix-functional-tests/lang/eval-okay-logic.nix diff --git a/tests/functional/lang/eval-okay-map.exp b/src/nix-functional-tests/lang/eval-okay-map.exp similarity index 100% rename from tests/functional/lang/eval-okay-map.exp rename to src/nix-functional-tests/lang/eval-okay-map.exp diff --git a/tests/functional/lang/eval-okay-map.nix b/src/nix-functional-tests/lang/eval-okay-map.nix similarity index 100% rename from tests/functional/lang/eval-okay-map.nix rename to src/nix-functional-tests/lang/eval-okay-map.nix diff --git a/tests/functional/lang/eval-okay-mapattrs.exp b/src/nix-functional-tests/lang/eval-okay-mapattrs.exp similarity index 100% rename from tests/functional/lang/eval-okay-mapattrs.exp rename to src/nix-functional-tests/lang/eval-okay-mapattrs.exp diff --git a/tests/functional/lang/eval-okay-mapattrs.nix b/src/nix-functional-tests/lang/eval-okay-mapattrs.nix similarity index 100% rename from tests/functional/lang/eval-okay-mapattrs.nix rename to src/nix-functional-tests/lang/eval-okay-mapattrs.nix diff --git a/tests/functional/lang/eval-okay-merge-dynamic-attrs.exp b/src/nix-functional-tests/lang/eval-okay-merge-dynamic-attrs.exp similarity index 100% rename from tests/functional/lang/eval-okay-merge-dynamic-attrs.exp rename to src/nix-functional-tests/lang/eval-okay-merge-dynamic-attrs.exp diff --git a/tests/functional/lang/eval-okay-merge-dynamic-attrs.nix b/src/nix-functional-tests/lang/eval-okay-merge-dynamic-attrs.nix similarity index 100% rename from tests/functional/lang/eval-okay-merge-dynamic-attrs.nix rename to src/nix-functional-tests/lang/eval-okay-merge-dynamic-attrs.nix diff --git a/tests/functional/lang/eval-okay-nested-with.exp b/src/nix-functional-tests/lang/eval-okay-nested-with.exp similarity index 100% rename from tests/functional/lang/eval-okay-nested-with.exp rename to src/nix-functional-tests/lang/eval-okay-nested-with.exp diff --git a/tests/functional/lang/eval-okay-nested-with.nix b/src/nix-functional-tests/lang/eval-okay-nested-with.nix similarity index 100% rename from tests/functional/lang/eval-okay-nested-with.nix rename to src/nix-functional-tests/lang/eval-okay-nested-with.nix diff --git a/tests/functional/lang/eval-okay-new-let.exp b/src/nix-functional-tests/lang/eval-okay-new-let.exp similarity index 100% rename from tests/functional/lang/eval-okay-new-let.exp rename to src/nix-functional-tests/lang/eval-okay-new-let.exp diff --git a/tests/functional/lang/eval-okay-new-let.nix b/src/nix-functional-tests/lang/eval-okay-new-let.nix similarity index 100% rename from tests/functional/lang/eval-okay-new-let.nix rename to src/nix-functional-tests/lang/eval-okay-new-let.nix diff --git a/tests/functional/lang/eval-okay-null-dynamic-attrs.exp b/src/nix-functional-tests/lang/eval-okay-null-dynamic-attrs.exp similarity index 100% rename from tests/functional/lang/eval-okay-null-dynamic-attrs.exp rename to src/nix-functional-tests/lang/eval-okay-null-dynamic-attrs.exp diff --git a/tests/functional/lang/eval-okay-null-dynamic-attrs.nix b/src/nix-functional-tests/lang/eval-okay-null-dynamic-attrs.nix similarity index 100% rename from tests/functional/lang/eval-okay-null-dynamic-attrs.nix rename to src/nix-functional-tests/lang/eval-okay-null-dynamic-attrs.nix diff --git a/tests/functional/lang/eval-okay-overrides.exp b/src/nix-functional-tests/lang/eval-okay-overrides.exp similarity index 100% rename from tests/functional/lang/eval-okay-overrides.exp rename to src/nix-functional-tests/lang/eval-okay-overrides.exp diff --git a/tests/functional/lang/eval-okay-overrides.nix b/src/nix-functional-tests/lang/eval-okay-overrides.nix similarity index 100% rename from tests/functional/lang/eval-okay-overrides.nix rename to src/nix-functional-tests/lang/eval-okay-overrides.nix diff --git a/tests/functional/lang/eval-okay-parse-flake-ref.exp b/src/nix-functional-tests/lang/eval-okay-parse-flake-ref.exp similarity index 100% rename from tests/functional/lang/eval-okay-parse-flake-ref.exp rename to src/nix-functional-tests/lang/eval-okay-parse-flake-ref.exp diff --git a/tests/functional/lang/eval-okay-parse-flake-ref.nix b/src/nix-functional-tests/lang/eval-okay-parse-flake-ref.nix similarity index 100% rename from tests/functional/lang/eval-okay-parse-flake-ref.nix rename to src/nix-functional-tests/lang/eval-okay-parse-flake-ref.nix diff --git a/tests/functional/lang/eval-okay-partition.exp b/src/nix-functional-tests/lang/eval-okay-partition.exp similarity index 100% rename from tests/functional/lang/eval-okay-partition.exp rename to src/nix-functional-tests/lang/eval-okay-partition.exp diff --git a/tests/functional/lang/eval-okay-partition.nix b/src/nix-functional-tests/lang/eval-okay-partition.nix similarity index 100% rename from tests/functional/lang/eval-okay-partition.nix rename to src/nix-functional-tests/lang/eval-okay-partition.nix diff --git a/tests/functional/lang/eval-okay-path-string-interpolation.exp b/src/nix-functional-tests/lang/eval-okay-path-string-interpolation.exp similarity index 100% rename from tests/functional/lang/eval-okay-path-string-interpolation.exp rename to src/nix-functional-tests/lang/eval-okay-path-string-interpolation.exp diff --git a/tests/functional/lang/eval-okay-path-string-interpolation.nix b/src/nix-functional-tests/lang/eval-okay-path-string-interpolation.nix similarity index 100% rename from tests/functional/lang/eval-okay-path-string-interpolation.nix rename to src/nix-functional-tests/lang/eval-okay-path-string-interpolation.nix diff --git a/tests/functional/lang/eval-okay-path.exp b/src/nix-functional-tests/lang/eval-okay-path.exp similarity index 100% rename from tests/functional/lang/eval-okay-path.exp rename to src/nix-functional-tests/lang/eval-okay-path.exp diff --git a/tests/functional/lang/eval-okay-path.nix b/src/nix-functional-tests/lang/eval-okay-path.nix similarity index 100% rename from tests/functional/lang/eval-okay-path.nix rename to src/nix-functional-tests/lang/eval-okay-path.nix diff --git a/tests/functional/lang/eval-okay-pathexists.exp b/src/nix-functional-tests/lang/eval-okay-pathexists.exp similarity index 100% rename from tests/functional/lang/eval-okay-pathexists.exp rename to src/nix-functional-tests/lang/eval-okay-pathexists.exp diff --git a/tests/functional/lang/eval-okay-pathexists.nix b/src/nix-functional-tests/lang/eval-okay-pathexists.nix similarity index 100% rename from tests/functional/lang/eval-okay-pathexists.nix rename to src/nix-functional-tests/lang/eval-okay-pathexists.nix diff --git a/tests/functional/lang/eval-okay-patterns.exp b/src/nix-functional-tests/lang/eval-okay-patterns.exp similarity index 100% rename from tests/functional/lang/eval-okay-patterns.exp rename to src/nix-functional-tests/lang/eval-okay-patterns.exp diff --git a/tests/functional/lang/eval-okay-patterns.nix b/src/nix-functional-tests/lang/eval-okay-patterns.nix similarity index 100% rename from tests/functional/lang/eval-okay-patterns.nix rename to src/nix-functional-tests/lang/eval-okay-patterns.nix diff --git a/tests/functional/lang/eval-okay-print.err.exp b/src/nix-functional-tests/lang/eval-okay-print.err.exp similarity index 100% rename from tests/functional/lang/eval-okay-print.err.exp rename to src/nix-functional-tests/lang/eval-okay-print.err.exp diff --git a/tests/functional/lang/eval-okay-print.exp b/src/nix-functional-tests/lang/eval-okay-print.exp similarity index 100% rename from tests/functional/lang/eval-okay-print.exp rename to src/nix-functional-tests/lang/eval-okay-print.exp diff --git a/tests/functional/lang/eval-okay-print.nix b/src/nix-functional-tests/lang/eval-okay-print.nix similarity index 100% rename from tests/functional/lang/eval-okay-print.nix rename to src/nix-functional-tests/lang/eval-okay-print.nix diff --git a/tests/functional/lang/eval-okay-readDir.exp b/src/nix-functional-tests/lang/eval-okay-readDir.exp similarity index 100% rename from tests/functional/lang/eval-okay-readDir.exp rename to src/nix-functional-tests/lang/eval-okay-readDir.exp diff --git a/tests/functional/lang/eval-okay-readDir.nix b/src/nix-functional-tests/lang/eval-okay-readDir.nix similarity index 100% rename from tests/functional/lang/eval-okay-readDir.nix rename to src/nix-functional-tests/lang/eval-okay-readDir.nix diff --git a/tests/functional/lang/eval-okay-readFileType.exp b/src/nix-functional-tests/lang/eval-okay-readFileType.exp similarity index 100% rename from tests/functional/lang/eval-okay-readFileType.exp rename to src/nix-functional-tests/lang/eval-okay-readFileType.exp diff --git a/tests/functional/lang/eval-okay-readFileType.nix b/src/nix-functional-tests/lang/eval-okay-readFileType.nix similarity index 100% rename from tests/functional/lang/eval-okay-readFileType.nix rename to src/nix-functional-tests/lang/eval-okay-readFileType.nix diff --git a/tests/functional/lang/eval-okay-readfile.exp b/src/nix-functional-tests/lang/eval-okay-readfile.exp similarity index 100% rename from tests/functional/lang/eval-okay-readfile.exp rename to src/nix-functional-tests/lang/eval-okay-readfile.exp diff --git a/tests/functional/lang/eval-okay-readfile.nix b/src/nix-functional-tests/lang/eval-okay-readfile.nix similarity index 100% rename from tests/functional/lang/eval-okay-readfile.nix rename to src/nix-functional-tests/lang/eval-okay-readfile.nix diff --git a/tests/functional/lang/eval-okay-redefine-builtin.exp b/src/nix-functional-tests/lang/eval-okay-redefine-builtin.exp similarity index 100% rename from tests/functional/lang/eval-okay-redefine-builtin.exp rename to src/nix-functional-tests/lang/eval-okay-redefine-builtin.exp diff --git a/tests/functional/lang/eval-okay-redefine-builtin.nix b/src/nix-functional-tests/lang/eval-okay-redefine-builtin.nix similarity index 100% rename from tests/functional/lang/eval-okay-redefine-builtin.nix rename to src/nix-functional-tests/lang/eval-okay-redefine-builtin.nix diff --git a/tests/functional/lang/eval-okay-regex-match.exp b/src/nix-functional-tests/lang/eval-okay-regex-match.exp similarity index 100% rename from tests/functional/lang/eval-okay-regex-match.exp rename to src/nix-functional-tests/lang/eval-okay-regex-match.exp diff --git a/tests/functional/lang/eval-okay-regex-match.nix b/src/nix-functional-tests/lang/eval-okay-regex-match.nix similarity index 100% rename from tests/functional/lang/eval-okay-regex-match.nix rename to src/nix-functional-tests/lang/eval-okay-regex-match.nix diff --git a/tests/functional/lang/eval-okay-regex-split.exp b/src/nix-functional-tests/lang/eval-okay-regex-split.exp similarity index 100% rename from tests/functional/lang/eval-okay-regex-split.exp rename to src/nix-functional-tests/lang/eval-okay-regex-split.exp diff --git a/tests/functional/lang/eval-okay-regex-split.nix b/src/nix-functional-tests/lang/eval-okay-regex-split.nix similarity index 100% rename from tests/functional/lang/eval-okay-regex-split.nix rename to src/nix-functional-tests/lang/eval-okay-regex-split.nix diff --git a/tests/functional/lang/eval-okay-regression-20220122.exp b/src/nix-functional-tests/lang/eval-okay-regression-20220122.exp similarity index 100% rename from tests/functional/lang/eval-okay-regression-20220122.exp rename to src/nix-functional-tests/lang/eval-okay-regression-20220122.exp diff --git a/tests/functional/lang/eval-okay-regression-20220122.nix b/src/nix-functional-tests/lang/eval-okay-regression-20220122.nix similarity index 100% rename from tests/functional/lang/eval-okay-regression-20220122.nix rename to src/nix-functional-tests/lang/eval-okay-regression-20220122.nix diff --git a/tests/functional/lang/eval-okay-regression-20220125.exp b/src/nix-functional-tests/lang/eval-okay-regression-20220125.exp similarity index 100% rename from tests/functional/lang/eval-okay-regression-20220125.exp rename to src/nix-functional-tests/lang/eval-okay-regression-20220125.exp diff --git a/tests/functional/lang/eval-okay-regression-20220125.nix b/src/nix-functional-tests/lang/eval-okay-regression-20220125.nix similarity index 100% rename from tests/functional/lang/eval-okay-regression-20220125.nix rename to src/nix-functional-tests/lang/eval-okay-regression-20220125.nix diff --git a/tests/functional/lang/eval-okay-remove.exp b/src/nix-functional-tests/lang/eval-okay-remove.exp similarity index 100% rename from tests/functional/lang/eval-okay-remove.exp rename to src/nix-functional-tests/lang/eval-okay-remove.exp diff --git a/tests/functional/lang/eval-okay-remove.nix b/src/nix-functional-tests/lang/eval-okay-remove.nix similarity index 100% rename from tests/functional/lang/eval-okay-remove.nix rename to src/nix-functional-tests/lang/eval-okay-remove.nix diff --git a/tests/functional/lang/eval-okay-repeated-empty-attrs.exp b/src/nix-functional-tests/lang/eval-okay-repeated-empty-attrs.exp similarity index 100% rename from tests/functional/lang/eval-okay-repeated-empty-attrs.exp rename to src/nix-functional-tests/lang/eval-okay-repeated-empty-attrs.exp diff --git a/tests/functional/lang/eval-okay-repeated-empty-attrs.nix b/src/nix-functional-tests/lang/eval-okay-repeated-empty-attrs.nix similarity index 100% rename from tests/functional/lang/eval-okay-repeated-empty-attrs.nix rename to src/nix-functional-tests/lang/eval-okay-repeated-empty-attrs.nix diff --git a/tests/functional/lang/eval-okay-repeated-empty-list.exp b/src/nix-functional-tests/lang/eval-okay-repeated-empty-list.exp similarity index 100% rename from tests/functional/lang/eval-okay-repeated-empty-list.exp rename to src/nix-functional-tests/lang/eval-okay-repeated-empty-list.exp diff --git a/tests/functional/lang/eval-okay-repeated-empty-list.nix b/src/nix-functional-tests/lang/eval-okay-repeated-empty-list.nix similarity index 100% rename from tests/functional/lang/eval-okay-repeated-empty-list.nix rename to src/nix-functional-tests/lang/eval-okay-repeated-empty-list.nix diff --git a/tests/functional/lang/eval-okay-replacestrings.exp b/src/nix-functional-tests/lang/eval-okay-replacestrings.exp similarity index 100% rename from tests/functional/lang/eval-okay-replacestrings.exp rename to src/nix-functional-tests/lang/eval-okay-replacestrings.exp diff --git a/tests/functional/lang/eval-okay-replacestrings.nix b/src/nix-functional-tests/lang/eval-okay-replacestrings.nix similarity index 100% rename from tests/functional/lang/eval-okay-replacestrings.nix rename to src/nix-functional-tests/lang/eval-okay-replacestrings.nix diff --git a/tests/functional/lang/eval-okay-scope-1.exp b/src/nix-functional-tests/lang/eval-okay-scope-1.exp similarity index 100% rename from tests/functional/lang/eval-okay-scope-1.exp rename to src/nix-functional-tests/lang/eval-okay-scope-1.exp diff --git a/tests/functional/lang/eval-okay-scope-1.nix b/src/nix-functional-tests/lang/eval-okay-scope-1.nix similarity index 100% rename from tests/functional/lang/eval-okay-scope-1.nix rename to src/nix-functional-tests/lang/eval-okay-scope-1.nix diff --git a/tests/functional/lang/eval-okay-scope-2.exp b/src/nix-functional-tests/lang/eval-okay-scope-2.exp similarity index 100% rename from tests/functional/lang/eval-okay-scope-2.exp rename to src/nix-functional-tests/lang/eval-okay-scope-2.exp diff --git a/tests/functional/lang/eval-okay-scope-2.nix b/src/nix-functional-tests/lang/eval-okay-scope-2.nix similarity index 100% rename from tests/functional/lang/eval-okay-scope-2.nix rename to src/nix-functional-tests/lang/eval-okay-scope-2.nix diff --git a/tests/functional/lang/eval-okay-scope-3.exp b/src/nix-functional-tests/lang/eval-okay-scope-3.exp similarity index 100% rename from tests/functional/lang/eval-okay-scope-3.exp rename to src/nix-functional-tests/lang/eval-okay-scope-3.exp diff --git a/tests/functional/lang/eval-okay-scope-3.nix b/src/nix-functional-tests/lang/eval-okay-scope-3.nix similarity index 100% rename from tests/functional/lang/eval-okay-scope-3.nix rename to src/nix-functional-tests/lang/eval-okay-scope-3.nix diff --git a/tests/functional/lang/eval-okay-scope-4.exp b/src/nix-functional-tests/lang/eval-okay-scope-4.exp similarity index 100% rename from tests/functional/lang/eval-okay-scope-4.exp rename to src/nix-functional-tests/lang/eval-okay-scope-4.exp diff --git a/tests/functional/lang/eval-okay-scope-4.nix b/src/nix-functional-tests/lang/eval-okay-scope-4.nix similarity index 100% rename from tests/functional/lang/eval-okay-scope-4.nix rename to src/nix-functional-tests/lang/eval-okay-scope-4.nix diff --git a/tests/functional/lang/eval-okay-scope-6.exp b/src/nix-functional-tests/lang/eval-okay-scope-6.exp similarity index 100% rename from tests/functional/lang/eval-okay-scope-6.exp rename to src/nix-functional-tests/lang/eval-okay-scope-6.exp diff --git a/tests/functional/lang/eval-okay-scope-6.nix b/src/nix-functional-tests/lang/eval-okay-scope-6.nix similarity index 100% rename from tests/functional/lang/eval-okay-scope-6.nix rename to src/nix-functional-tests/lang/eval-okay-scope-6.nix diff --git a/tests/functional/lang/eval-okay-scope-7.exp b/src/nix-functional-tests/lang/eval-okay-scope-7.exp similarity index 100% rename from tests/functional/lang/eval-okay-scope-7.exp rename to src/nix-functional-tests/lang/eval-okay-scope-7.exp diff --git a/tests/functional/lang/eval-okay-scope-7.nix b/src/nix-functional-tests/lang/eval-okay-scope-7.nix similarity index 100% rename from tests/functional/lang/eval-okay-scope-7.nix rename to src/nix-functional-tests/lang/eval-okay-scope-7.nix diff --git a/tests/functional/lang/eval-okay-search-path.exp b/src/nix-functional-tests/lang/eval-okay-search-path.exp similarity index 100% rename from tests/functional/lang/eval-okay-search-path.exp rename to src/nix-functional-tests/lang/eval-okay-search-path.exp diff --git a/tests/functional/lang/eval-okay-search-path.flags b/src/nix-functional-tests/lang/eval-okay-search-path.flags similarity index 100% rename from tests/functional/lang/eval-okay-search-path.flags rename to src/nix-functional-tests/lang/eval-okay-search-path.flags diff --git a/tests/functional/lang/eval-okay-search-path.nix b/src/nix-functional-tests/lang/eval-okay-search-path.nix similarity index 100% rename from tests/functional/lang/eval-okay-search-path.nix rename to src/nix-functional-tests/lang/eval-okay-search-path.nix diff --git a/tests/functional/lang/eval-okay-seq.exp b/src/nix-functional-tests/lang/eval-okay-seq.exp similarity index 100% rename from tests/functional/lang/eval-okay-seq.exp rename to src/nix-functional-tests/lang/eval-okay-seq.exp diff --git a/tests/functional/lang/eval-okay-seq.nix b/src/nix-functional-tests/lang/eval-okay-seq.nix similarity index 100% rename from tests/functional/lang/eval-okay-seq.nix rename to src/nix-functional-tests/lang/eval-okay-seq.nix diff --git a/tests/functional/lang/eval-okay-sort.exp b/src/nix-functional-tests/lang/eval-okay-sort.exp similarity index 100% rename from tests/functional/lang/eval-okay-sort.exp rename to src/nix-functional-tests/lang/eval-okay-sort.exp diff --git a/tests/functional/lang/eval-okay-sort.nix b/src/nix-functional-tests/lang/eval-okay-sort.nix similarity index 100% rename from tests/functional/lang/eval-okay-sort.nix rename to src/nix-functional-tests/lang/eval-okay-sort.nix diff --git a/tests/functional/lang/eval-okay-splitversion.exp b/src/nix-functional-tests/lang/eval-okay-splitversion.exp similarity index 100% rename from tests/functional/lang/eval-okay-splitversion.exp rename to src/nix-functional-tests/lang/eval-okay-splitversion.exp diff --git a/tests/functional/lang/eval-okay-splitversion.nix b/src/nix-functional-tests/lang/eval-okay-splitversion.nix similarity index 100% rename from tests/functional/lang/eval-okay-splitversion.nix rename to src/nix-functional-tests/lang/eval-okay-splitversion.nix diff --git a/tests/functional/lang/eval-okay-string.exp b/src/nix-functional-tests/lang/eval-okay-string.exp similarity index 100% rename from tests/functional/lang/eval-okay-string.exp rename to src/nix-functional-tests/lang/eval-okay-string.exp diff --git a/tests/functional/lang/eval-okay-string.nix b/src/nix-functional-tests/lang/eval-okay-string.nix similarity index 100% rename from tests/functional/lang/eval-okay-string.nix rename to src/nix-functional-tests/lang/eval-okay-string.nix diff --git a/tests/functional/lang/eval-okay-strings-as-attrs-names.exp b/src/nix-functional-tests/lang/eval-okay-strings-as-attrs-names.exp similarity index 100% rename from tests/functional/lang/eval-okay-strings-as-attrs-names.exp rename to src/nix-functional-tests/lang/eval-okay-strings-as-attrs-names.exp diff --git a/tests/functional/lang/eval-okay-strings-as-attrs-names.nix b/src/nix-functional-tests/lang/eval-okay-strings-as-attrs-names.nix similarity index 100% rename from tests/functional/lang/eval-okay-strings-as-attrs-names.nix rename to src/nix-functional-tests/lang/eval-okay-strings-as-attrs-names.nix diff --git a/tests/functional/lang/eval-okay-substring-context.exp b/src/nix-functional-tests/lang/eval-okay-substring-context.exp similarity index 100% rename from tests/functional/lang/eval-okay-substring-context.exp rename to src/nix-functional-tests/lang/eval-okay-substring-context.exp diff --git a/tests/functional/lang/eval-okay-substring-context.nix b/src/nix-functional-tests/lang/eval-okay-substring-context.nix similarity index 100% rename from tests/functional/lang/eval-okay-substring-context.nix rename to src/nix-functional-tests/lang/eval-okay-substring-context.nix diff --git a/tests/functional/lang/eval-okay-substring.exp b/src/nix-functional-tests/lang/eval-okay-substring.exp similarity index 100% rename from tests/functional/lang/eval-okay-substring.exp rename to src/nix-functional-tests/lang/eval-okay-substring.exp diff --git a/tests/functional/lang/eval-okay-substring.nix b/src/nix-functional-tests/lang/eval-okay-substring.nix similarity index 100% rename from tests/functional/lang/eval-okay-substring.nix rename to src/nix-functional-tests/lang/eval-okay-substring.nix diff --git a/tests/functional/lang/eval-okay-symlink-resolution.exp b/src/nix-functional-tests/lang/eval-okay-symlink-resolution.exp similarity index 100% rename from tests/functional/lang/eval-okay-symlink-resolution.exp rename to src/nix-functional-tests/lang/eval-okay-symlink-resolution.exp diff --git a/tests/functional/lang/eval-okay-symlink-resolution.nix b/src/nix-functional-tests/lang/eval-okay-symlink-resolution.nix similarity index 100% rename from tests/functional/lang/eval-okay-symlink-resolution.nix rename to src/nix-functional-tests/lang/eval-okay-symlink-resolution.nix diff --git a/tests/functional/lang/eval-okay-tail-call-1.exp-disabled b/src/nix-functional-tests/lang/eval-okay-tail-call-1.exp-disabled similarity index 100% rename from tests/functional/lang/eval-okay-tail-call-1.exp-disabled rename to src/nix-functional-tests/lang/eval-okay-tail-call-1.exp-disabled diff --git a/tests/functional/lang/eval-okay-tail-call-1.nix b/src/nix-functional-tests/lang/eval-okay-tail-call-1.nix similarity index 100% rename from tests/functional/lang/eval-okay-tail-call-1.nix rename to src/nix-functional-tests/lang/eval-okay-tail-call-1.nix diff --git a/tests/functional/lang/eval-okay-tojson.exp b/src/nix-functional-tests/lang/eval-okay-tojson.exp similarity index 100% rename from tests/functional/lang/eval-okay-tojson.exp rename to src/nix-functional-tests/lang/eval-okay-tojson.exp diff --git a/tests/functional/lang/eval-okay-tojson.nix b/src/nix-functional-tests/lang/eval-okay-tojson.nix similarity index 100% rename from tests/functional/lang/eval-okay-tojson.nix rename to src/nix-functional-tests/lang/eval-okay-tojson.nix diff --git a/tests/functional/lang/eval-okay-toxml.exp b/src/nix-functional-tests/lang/eval-okay-toxml.exp similarity index 100% rename from tests/functional/lang/eval-okay-toxml.exp rename to src/nix-functional-tests/lang/eval-okay-toxml.exp diff --git a/tests/functional/lang/eval-okay-toxml.nix b/src/nix-functional-tests/lang/eval-okay-toxml.nix similarity index 100% rename from tests/functional/lang/eval-okay-toxml.nix rename to src/nix-functional-tests/lang/eval-okay-toxml.nix diff --git a/tests/functional/lang/eval-okay-toxml2.exp b/src/nix-functional-tests/lang/eval-okay-toxml2.exp similarity index 100% rename from tests/functional/lang/eval-okay-toxml2.exp rename to src/nix-functional-tests/lang/eval-okay-toxml2.exp diff --git a/tests/functional/lang/eval-okay-toxml2.nix b/src/nix-functional-tests/lang/eval-okay-toxml2.nix similarity index 100% rename from tests/functional/lang/eval-okay-toxml2.nix rename to src/nix-functional-tests/lang/eval-okay-toxml2.nix diff --git a/tests/functional/lang/eval-okay-tryeval.exp b/src/nix-functional-tests/lang/eval-okay-tryeval.exp similarity index 100% rename from tests/functional/lang/eval-okay-tryeval.exp rename to src/nix-functional-tests/lang/eval-okay-tryeval.exp diff --git a/tests/functional/lang/eval-okay-tryeval.nix b/src/nix-functional-tests/lang/eval-okay-tryeval.nix similarity index 100% rename from tests/functional/lang/eval-okay-tryeval.nix rename to src/nix-functional-tests/lang/eval-okay-tryeval.nix diff --git a/tests/functional/lang/eval-okay-types.exp b/src/nix-functional-tests/lang/eval-okay-types.exp similarity index 100% rename from tests/functional/lang/eval-okay-types.exp rename to src/nix-functional-tests/lang/eval-okay-types.exp diff --git a/tests/functional/lang/eval-okay-types.nix b/src/nix-functional-tests/lang/eval-okay-types.nix similarity index 100% rename from tests/functional/lang/eval-okay-types.nix rename to src/nix-functional-tests/lang/eval-okay-types.nix diff --git a/tests/functional/lang/eval-okay-versions.exp b/src/nix-functional-tests/lang/eval-okay-versions.exp similarity index 100% rename from tests/functional/lang/eval-okay-versions.exp rename to src/nix-functional-tests/lang/eval-okay-versions.exp diff --git a/tests/functional/lang/eval-okay-versions.nix b/src/nix-functional-tests/lang/eval-okay-versions.nix similarity index 100% rename from tests/functional/lang/eval-okay-versions.nix rename to src/nix-functional-tests/lang/eval-okay-versions.nix diff --git a/tests/functional/lang/eval-okay-with.exp b/src/nix-functional-tests/lang/eval-okay-with.exp similarity index 100% rename from tests/functional/lang/eval-okay-with.exp rename to src/nix-functional-tests/lang/eval-okay-with.exp diff --git a/tests/functional/lang/eval-okay-with.nix b/src/nix-functional-tests/lang/eval-okay-with.nix similarity index 100% rename from tests/functional/lang/eval-okay-with.nix rename to src/nix-functional-tests/lang/eval-okay-with.nix diff --git a/tests/functional/lang/eval-okay-xml.exp.xml b/src/nix-functional-tests/lang/eval-okay-xml.exp.xml similarity index 100% rename from tests/functional/lang/eval-okay-xml.exp.xml rename to src/nix-functional-tests/lang/eval-okay-xml.exp.xml diff --git a/tests/functional/lang/eval-okay-xml.nix b/src/nix-functional-tests/lang/eval-okay-xml.nix similarity index 100% rename from tests/functional/lang/eval-okay-xml.nix rename to src/nix-functional-tests/lang/eval-okay-xml.nix diff --git a/tests/functional/lang/eval-okay-zipAttrsWith.exp b/src/nix-functional-tests/lang/eval-okay-zipAttrsWith.exp similarity index 100% rename from tests/functional/lang/eval-okay-zipAttrsWith.exp rename to src/nix-functional-tests/lang/eval-okay-zipAttrsWith.exp diff --git a/tests/functional/lang/eval-okay-zipAttrsWith.nix b/src/nix-functional-tests/lang/eval-okay-zipAttrsWith.nix similarity index 100% rename from tests/functional/lang/eval-okay-zipAttrsWith.nix rename to src/nix-functional-tests/lang/eval-okay-zipAttrsWith.nix diff --git a/tests/functional/lang/imported.nix b/src/nix-functional-tests/lang/imported.nix similarity index 100% rename from tests/functional/lang/imported.nix rename to src/nix-functional-tests/lang/imported.nix diff --git a/tests/functional/lang/imported2.nix b/src/nix-functional-tests/lang/imported2.nix similarity index 100% rename from tests/functional/lang/imported2.nix rename to src/nix-functional-tests/lang/imported2.nix diff --git a/tests/functional/lang/lib.nix b/src/nix-functional-tests/lang/lib.nix similarity index 100% rename from tests/functional/lang/lib.nix rename to src/nix-functional-tests/lang/lib.nix diff --git a/tests/functional/lang/non-eval-fail-bad-drvPath.nix b/src/nix-functional-tests/lang/non-eval-fail-bad-drvPath.nix similarity index 100% rename from tests/functional/lang/non-eval-fail-bad-drvPath.nix rename to src/nix-functional-tests/lang/non-eval-fail-bad-drvPath.nix diff --git a/tests/functional/lang/parse-fail-dup-attrs-1.err.exp b/src/nix-functional-tests/lang/parse-fail-dup-attrs-1.err.exp similarity index 100% rename from tests/functional/lang/parse-fail-dup-attrs-1.err.exp rename to src/nix-functional-tests/lang/parse-fail-dup-attrs-1.err.exp diff --git a/tests/functional/lang/parse-fail-dup-attrs-1.nix b/src/nix-functional-tests/lang/parse-fail-dup-attrs-1.nix similarity index 100% rename from tests/functional/lang/parse-fail-dup-attrs-1.nix rename to src/nix-functional-tests/lang/parse-fail-dup-attrs-1.nix diff --git a/tests/functional/lang/parse-fail-dup-attrs-2.err.exp b/src/nix-functional-tests/lang/parse-fail-dup-attrs-2.err.exp similarity index 100% rename from tests/functional/lang/parse-fail-dup-attrs-2.err.exp rename to src/nix-functional-tests/lang/parse-fail-dup-attrs-2.err.exp diff --git a/tests/functional/lang/parse-fail-dup-attrs-2.nix b/src/nix-functional-tests/lang/parse-fail-dup-attrs-2.nix similarity index 100% rename from tests/functional/lang/parse-fail-dup-attrs-2.nix rename to src/nix-functional-tests/lang/parse-fail-dup-attrs-2.nix diff --git a/tests/functional/lang/parse-fail-dup-attrs-3.err.exp b/src/nix-functional-tests/lang/parse-fail-dup-attrs-3.err.exp similarity index 100% rename from tests/functional/lang/parse-fail-dup-attrs-3.err.exp rename to src/nix-functional-tests/lang/parse-fail-dup-attrs-3.err.exp diff --git a/tests/functional/lang/parse-fail-dup-attrs-3.nix b/src/nix-functional-tests/lang/parse-fail-dup-attrs-3.nix similarity index 100% rename from tests/functional/lang/parse-fail-dup-attrs-3.nix rename to src/nix-functional-tests/lang/parse-fail-dup-attrs-3.nix diff --git a/tests/functional/lang/parse-fail-dup-attrs-4.err.exp b/src/nix-functional-tests/lang/parse-fail-dup-attrs-4.err.exp similarity index 100% rename from tests/functional/lang/parse-fail-dup-attrs-4.err.exp rename to src/nix-functional-tests/lang/parse-fail-dup-attrs-4.err.exp diff --git a/tests/functional/lang/parse-fail-dup-attrs-4.nix b/src/nix-functional-tests/lang/parse-fail-dup-attrs-4.nix similarity index 100% rename from tests/functional/lang/parse-fail-dup-attrs-4.nix rename to src/nix-functional-tests/lang/parse-fail-dup-attrs-4.nix diff --git a/tests/functional/lang/parse-fail-dup-attrs-7.err.exp b/src/nix-functional-tests/lang/parse-fail-dup-attrs-7.err.exp similarity index 100% rename from tests/functional/lang/parse-fail-dup-attrs-7.err.exp rename to src/nix-functional-tests/lang/parse-fail-dup-attrs-7.err.exp diff --git a/tests/functional/lang/parse-fail-dup-attrs-7.nix b/src/nix-functional-tests/lang/parse-fail-dup-attrs-7.nix similarity index 100% rename from tests/functional/lang/parse-fail-dup-attrs-7.nix rename to src/nix-functional-tests/lang/parse-fail-dup-attrs-7.nix diff --git a/tests/functional/lang/parse-fail-dup-formals.err.exp b/src/nix-functional-tests/lang/parse-fail-dup-formals.err.exp similarity index 100% rename from tests/functional/lang/parse-fail-dup-formals.err.exp rename to src/nix-functional-tests/lang/parse-fail-dup-formals.err.exp diff --git a/tests/functional/lang/parse-fail-dup-formals.nix b/src/nix-functional-tests/lang/parse-fail-dup-formals.nix similarity index 100% rename from tests/functional/lang/parse-fail-dup-formals.nix rename to src/nix-functional-tests/lang/parse-fail-dup-formals.nix diff --git a/tests/functional/lang/parse-fail-eof-in-string.err.exp b/src/nix-functional-tests/lang/parse-fail-eof-in-string.err.exp similarity index 100% rename from tests/functional/lang/parse-fail-eof-in-string.err.exp rename to src/nix-functional-tests/lang/parse-fail-eof-in-string.err.exp diff --git a/tests/functional/lang/parse-fail-eof-in-string.nix b/src/nix-functional-tests/lang/parse-fail-eof-in-string.nix similarity index 100% rename from tests/functional/lang/parse-fail-eof-in-string.nix rename to src/nix-functional-tests/lang/parse-fail-eof-in-string.nix diff --git a/tests/functional/lang/parse-fail-eof-pos.err.exp b/src/nix-functional-tests/lang/parse-fail-eof-pos.err.exp similarity index 100% rename from tests/functional/lang/parse-fail-eof-pos.err.exp rename to src/nix-functional-tests/lang/parse-fail-eof-pos.err.exp diff --git a/tests/functional/lang/parse-fail-eof-pos.nix b/src/nix-functional-tests/lang/parse-fail-eof-pos.nix similarity index 100% rename from tests/functional/lang/parse-fail-eof-pos.nix rename to src/nix-functional-tests/lang/parse-fail-eof-pos.nix diff --git a/tests/functional/lang/parse-fail-mixed-nested-attrs1.err.exp b/src/nix-functional-tests/lang/parse-fail-mixed-nested-attrs1.err.exp similarity index 100% rename from tests/functional/lang/parse-fail-mixed-nested-attrs1.err.exp rename to src/nix-functional-tests/lang/parse-fail-mixed-nested-attrs1.err.exp diff --git a/tests/functional/lang/parse-fail-mixed-nested-attrs1.nix b/src/nix-functional-tests/lang/parse-fail-mixed-nested-attrs1.nix similarity index 100% rename from tests/functional/lang/parse-fail-mixed-nested-attrs1.nix rename to src/nix-functional-tests/lang/parse-fail-mixed-nested-attrs1.nix diff --git a/tests/functional/lang/parse-fail-mixed-nested-attrs2.err.exp b/src/nix-functional-tests/lang/parse-fail-mixed-nested-attrs2.err.exp similarity index 100% rename from tests/functional/lang/parse-fail-mixed-nested-attrs2.err.exp rename to src/nix-functional-tests/lang/parse-fail-mixed-nested-attrs2.err.exp diff --git a/tests/functional/lang/parse-fail-mixed-nested-attrs2.nix b/src/nix-functional-tests/lang/parse-fail-mixed-nested-attrs2.nix similarity index 100% rename from tests/functional/lang/parse-fail-mixed-nested-attrs2.nix rename to src/nix-functional-tests/lang/parse-fail-mixed-nested-attrs2.nix diff --git a/tests/functional/lang/parse-fail-patterns-1.err.exp b/src/nix-functional-tests/lang/parse-fail-patterns-1.err.exp similarity index 100% rename from tests/functional/lang/parse-fail-patterns-1.err.exp rename to src/nix-functional-tests/lang/parse-fail-patterns-1.err.exp diff --git a/tests/functional/lang/parse-fail-patterns-1.nix b/src/nix-functional-tests/lang/parse-fail-patterns-1.nix similarity index 100% rename from tests/functional/lang/parse-fail-patterns-1.nix rename to src/nix-functional-tests/lang/parse-fail-patterns-1.nix diff --git a/tests/functional/lang/parse-fail-regression-20060610.err.exp b/src/nix-functional-tests/lang/parse-fail-regression-20060610.err.exp similarity index 100% rename from tests/functional/lang/parse-fail-regression-20060610.err.exp rename to src/nix-functional-tests/lang/parse-fail-regression-20060610.err.exp diff --git a/tests/functional/lang/parse-fail-regression-20060610.nix b/src/nix-functional-tests/lang/parse-fail-regression-20060610.nix similarity index 100% rename from tests/functional/lang/parse-fail-regression-20060610.nix rename to src/nix-functional-tests/lang/parse-fail-regression-20060610.nix diff --git a/tests/functional/lang/parse-fail-undef-var-2.err.exp b/src/nix-functional-tests/lang/parse-fail-undef-var-2.err.exp similarity index 100% rename from tests/functional/lang/parse-fail-undef-var-2.err.exp rename to src/nix-functional-tests/lang/parse-fail-undef-var-2.err.exp diff --git a/tests/functional/lang/parse-fail-undef-var-2.nix b/src/nix-functional-tests/lang/parse-fail-undef-var-2.nix similarity index 100% rename from tests/functional/lang/parse-fail-undef-var-2.nix rename to src/nix-functional-tests/lang/parse-fail-undef-var-2.nix diff --git a/tests/functional/lang/parse-fail-undef-var.err.exp b/src/nix-functional-tests/lang/parse-fail-undef-var.err.exp similarity index 100% rename from tests/functional/lang/parse-fail-undef-var.err.exp rename to src/nix-functional-tests/lang/parse-fail-undef-var.err.exp diff --git a/tests/functional/lang/parse-fail-undef-var.nix b/src/nix-functional-tests/lang/parse-fail-undef-var.nix similarity index 100% rename from tests/functional/lang/parse-fail-undef-var.nix rename to src/nix-functional-tests/lang/parse-fail-undef-var.nix diff --git a/tests/functional/lang/parse-fail-utf8.err.exp b/src/nix-functional-tests/lang/parse-fail-utf8.err.exp similarity index 100% rename from tests/functional/lang/parse-fail-utf8.err.exp rename to src/nix-functional-tests/lang/parse-fail-utf8.err.exp diff --git a/tests/functional/lang/parse-fail-utf8.nix b/src/nix-functional-tests/lang/parse-fail-utf8.nix similarity index 100% rename from tests/functional/lang/parse-fail-utf8.nix rename to src/nix-functional-tests/lang/parse-fail-utf8.nix diff --git a/tests/functional/lang/parse-okay-1.exp b/src/nix-functional-tests/lang/parse-okay-1.exp similarity index 100% rename from tests/functional/lang/parse-okay-1.exp rename to src/nix-functional-tests/lang/parse-okay-1.exp diff --git a/tests/functional/lang/parse-okay-1.nix b/src/nix-functional-tests/lang/parse-okay-1.nix similarity index 100% rename from tests/functional/lang/parse-okay-1.nix rename to src/nix-functional-tests/lang/parse-okay-1.nix diff --git a/tests/functional/lang/parse-okay-crlf.exp b/src/nix-functional-tests/lang/parse-okay-crlf.exp similarity index 100% rename from tests/functional/lang/parse-okay-crlf.exp rename to src/nix-functional-tests/lang/parse-okay-crlf.exp diff --git a/tests/functional/lang/parse-okay-crlf.nix b/src/nix-functional-tests/lang/parse-okay-crlf.nix similarity index 100% rename from tests/functional/lang/parse-okay-crlf.nix rename to src/nix-functional-tests/lang/parse-okay-crlf.nix diff --git a/tests/functional/lang/parse-okay-dup-attrs-5.exp b/src/nix-functional-tests/lang/parse-okay-dup-attrs-5.exp similarity index 100% rename from tests/functional/lang/parse-okay-dup-attrs-5.exp rename to src/nix-functional-tests/lang/parse-okay-dup-attrs-5.exp diff --git a/tests/functional/lang/parse-okay-dup-attrs-5.nix b/src/nix-functional-tests/lang/parse-okay-dup-attrs-5.nix similarity index 100% rename from tests/functional/lang/parse-okay-dup-attrs-5.nix rename to src/nix-functional-tests/lang/parse-okay-dup-attrs-5.nix diff --git a/tests/functional/lang/parse-okay-dup-attrs-6.exp b/src/nix-functional-tests/lang/parse-okay-dup-attrs-6.exp similarity index 100% rename from tests/functional/lang/parse-okay-dup-attrs-6.exp rename to src/nix-functional-tests/lang/parse-okay-dup-attrs-6.exp diff --git a/tests/functional/lang/parse-okay-dup-attrs-6.nix b/src/nix-functional-tests/lang/parse-okay-dup-attrs-6.nix similarity index 100% rename from tests/functional/lang/parse-okay-dup-attrs-6.nix rename to src/nix-functional-tests/lang/parse-okay-dup-attrs-6.nix diff --git a/tests/functional/lang/parse-okay-ind-string.exp b/src/nix-functional-tests/lang/parse-okay-ind-string.exp similarity index 100% rename from tests/functional/lang/parse-okay-ind-string.exp rename to src/nix-functional-tests/lang/parse-okay-ind-string.exp diff --git a/tests/functional/lang/parse-okay-ind-string.nix b/src/nix-functional-tests/lang/parse-okay-ind-string.nix similarity index 100% rename from tests/functional/lang/parse-okay-ind-string.nix rename to src/nix-functional-tests/lang/parse-okay-ind-string.nix diff --git a/tests/functional/lang/parse-okay-inherits.exp b/src/nix-functional-tests/lang/parse-okay-inherits.exp similarity index 100% rename from tests/functional/lang/parse-okay-inherits.exp rename to src/nix-functional-tests/lang/parse-okay-inherits.exp diff --git a/tests/functional/lang/parse-okay-inherits.nix b/src/nix-functional-tests/lang/parse-okay-inherits.nix similarity index 100% rename from tests/functional/lang/parse-okay-inherits.nix rename to src/nix-functional-tests/lang/parse-okay-inherits.nix diff --git a/tests/functional/lang/parse-okay-mixed-nested-attrs-1.exp b/src/nix-functional-tests/lang/parse-okay-mixed-nested-attrs-1.exp similarity index 100% rename from tests/functional/lang/parse-okay-mixed-nested-attrs-1.exp rename to src/nix-functional-tests/lang/parse-okay-mixed-nested-attrs-1.exp diff --git a/tests/functional/lang/parse-okay-mixed-nested-attrs-1.nix b/src/nix-functional-tests/lang/parse-okay-mixed-nested-attrs-1.nix similarity index 100% rename from tests/functional/lang/parse-okay-mixed-nested-attrs-1.nix rename to src/nix-functional-tests/lang/parse-okay-mixed-nested-attrs-1.nix diff --git a/tests/functional/lang/parse-okay-mixed-nested-attrs-2.exp b/src/nix-functional-tests/lang/parse-okay-mixed-nested-attrs-2.exp similarity index 100% rename from tests/functional/lang/parse-okay-mixed-nested-attrs-2.exp rename to src/nix-functional-tests/lang/parse-okay-mixed-nested-attrs-2.exp diff --git a/tests/functional/lang/parse-okay-mixed-nested-attrs-2.nix b/src/nix-functional-tests/lang/parse-okay-mixed-nested-attrs-2.nix similarity index 100% rename from tests/functional/lang/parse-okay-mixed-nested-attrs-2.nix rename to src/nix-functional-tests/lang/parse-okay-mixed-nested-attrs-2.nix diff --git a/tests/functional/lang/parse-okay-mixed-nested-attrs-3.exp b/src/nix-functional-tests/lang/parse-okay-mixed-nested-attrs-3.exp similarity index 100% rename from tests/functional/lang/parse-okay-mixed-nested-attrs-3.exp rename to src/nix-functional-tests/lang/parse-okay-mixed-nested-attrs-3.exp diff --git a/tests/functional/lang/parse-okay-mixed-nested-attrs-3.nix b/src/nix-functional-tests/lang/parse-okay-mixed-nested-attrs-3.nix similarity index 100% rename from tests/functional/lang/parse-okay-mixed-nested-attrs-3.nix rename to src/nix-functional-tests/lang/parse-okay-mixed-nested-attrs-3.nix diff --git a/tests/functional/lang/parse-okay-regression-20041027.exp b/src/nix-functional-tests/lang/parse-okay-regression-20041027.exp similarity index 100% rename from tests/functional/lang/parse-okay-regression-20041027.exp rename to src/nix-functional-tests/lang/parse-okay-regression-20041027.exp diff --git a/tests/functional/lang/parse-okay-regression-20041027.nix b/src/nix-functional-tests/lang/parse-okay-regression-20041027.nix similarity index 100% rename from tests/functional/lang/parse-okay-regression-20041027.nix rename to src/nix-functional-tests/lang/parse-okay-regression-20041027.nix diff --git a/tests/functional/lang/parse-okay-regression-751.exp b/src/nix-functional-tests/lang/parse-okay-regression-751.exp similarity index 100% rename from tests/functional/lang/parse-okay-regression-751.exp rename to src/nix-functional-tests/lang/parse-okay-regression-751.exp diff --git a/tests/functional/lang/parse-okay-regression-751.nix b/src/nix-functional-tests/lang/parse-okay-regression-751.nix similarity index 100% rename from tests/functional/lang/parse-okay-regression-751.nix rename to src/nix-functional-tests/lang/parse-okay-regression-751.nix diff --git a/tests/functional/lang/parse-okay-subversion.exp b/src/nix-functional-tests/lang/parse-okay-subversion.exp similarity index 100% rename from tests/functional/lang/parse-okay-subversion.exp rename to src/nix-functional-tests/lang/parse-okay-subversion.exp diff --git a/tests/functional/lang/parse-okay-subversion.nix b/src/nix-functional-tests/lang/parse-okay-subversion.nix similarity index 100% rename from tests/functional/lang/parse-okay-subversion.nix rename to src/nix-functional-tests/lang/parse-okay-subversion.nix diff --git a/tests/functional/lang/parse-okay-url.exp b/src/nix-functional-tests/lang/parse-okay-url.exp similarity index 100% rename from tests/functional/lang/parse-okay-url.exp rename to src/nix-functional-tests/lang/parse-okay-url.exp diff --git a/tests/functional/lang/parse-okay-url.nix b/src/nix-functional-tests/lang/parse-okay-url.nix similarity index 100% rename from tests/functional/lang/parse-okay-url.nix rename to src/nix-functional-tests/lang/parse-okay-url.nix diff --git a/tests/functional/lang/readDir/bar b/src/nix-functional-tests/lang/readDir/bar similarity index 100% rename from tests/functional/lang/readDir/bar rename to src/nix-functional-tests/lang/readDir/bar diff --git a/tests/functional/lang/readDir/foo/git-hates-directories b/src/nix-functional-tests/lang/readDir/foo/git-hates-directories similarity index 100% rename from tests/functional/lang/readDir/foo/git-hates-directories rename to src/nix-functional-tests/lang/readDir/foo/git-hates-directories diff --git a/tests/functional/lang/readDir/ldir b/src/nix-functional-tests/lang/readDir/ldir similarity index 100% rename from tests/functional/lang/readDir/ldir rename to src/nix-functional-tests/lang/readDir/ldir diff --git a/tests/functional/lang/readDir/linked b/src/nix-functional-tests/lang/readDir/linked similarity index 100% rename from tests/functional/lang/readDir/linked rename to src/nix-functional-tests/lang/readDir/linked diff --git a/tests/functional/lang/symlink-resolution/broken b/src/nix-functional-tests/lang/symlink-resolution/broken similarity index 100% rename from tests/functional/lang/symlink-resolution/broken rename to src/nix-functional-tests/lang/symlink-resolution/broken diff --git a/tests/functional/lang/symlink-resolution/foo/lib/default.nix b/src/nix-functional-tests/lang/symlink-resolution/foo/lib/default.nix similarity index 100% rename from tests/functional/lang/symlink-resolution/foo/lib/default.nix rename to src/nix-functional-tests/lang/symlink-resolution/foo/lib/default.nix diff --git a/tests/functional/lang/symlink-resolution/foo/overlays b/src/nix-functional-tests/lang/symlink-resolution/foo/overlays similarity index 100% rename from tests/functional/lang/symlink-resolution/foo/overlays rename to src/nix-functional-tests/lang/symlink-resolution/foo/overlays diff --git a/tests/functional/lang/symlink-resolution/overlays/overlay.nix b/src/nix-functional-tests/lang/symlink-resolution/overlays/overlay.nix similarity index 100% rename from tests/functional/lang/symlink-resolution/overlays/overlay.nix rename to src/nix-functional-tests/lang/symlink-resolution/overlays/overlay.nix diff --git a/tests/functional/legacy-ssh-store.sh b/src/nix-functional-tests/legacy-ssh-store.sh similarity index 100% rename from tests/functional/legacy-ssh-store.sh rename to src/nix-functional-tests/legacy-ssh-store.sh diff --git a/tests/functional/linux-sandbox-cert-test.nix b/src/nix-functional-tests/linux-sandbox-cert-test.nix similarity index 100% rename from tests/functional/linux-sandbox-cert-test.nix rename to src/nix-functional-tests/linux-sandbox-cert-test.nix diff --git a/tests/functional/linux-sandbox.sh b/src/nix-functional-tests/linux-sandbox.sh similarity index 100% rename from tests/functional/linux-sandbox.sh rename to src/nix-functional-tests/linux-sandbox.sh diff --git a/tests/functional/local-overlay-store/add-lower-inner.sh b/src/nix-functional-tests/local-overlay-store/add-lower-inner.sh similarity index 100% rename from tests/functional/local-overlay-store/add-lower-inner.sh rename to src/nix-functional-tests/local-overlay-store/add-lower-inner.sh diff --git a/tests/functional/local-overlay-store/add-lower.sh b/src/nix-functional-tests/local-overlay-store/add-lower.sh similarity index 100% rename from tests/functional/local-overlay-store/add-lower.sh rename to src/nix-functional-tests/local-overlay-store/add-lower.sh diff --git a/tests/functional/local-overlay-store/bad-uris.sh b/src/nix-functional-tests/local-overlay-store/bad-uris.sh similarity index 100% rename from tests/functional/local-overlay-store/bad-uris.sh rename to src/nix-functional-tests/local-overlay-store/bad-uris.sh diff --git a/tests/functional/local-overlay-store/build-inner.sh b/src/nix-functional-tests/local-overlay-store/build-inner.sh similarity index 100% rename from tests/functional/local-overlay-store/build-inner.sh rename to src/nix-functional-tests/local-overlay-store/build-inner.sh diff --git a/tests/functional/local-overlay-store/build.sh b/src/nix-functional-tests/local-overlay-store/build.sh similarity index 100% rename from tests/functional/local-overlay-store/build.sh rename to src/nix-functional-tests/local-overlay-store/build.sh diff --git a/tests/functional/local-overlay-store/check-post-init-inner.sh b/src/nix-functional-tests/local-overlay-store/check-post-init-inner.sh similarity index 100% rename from tests/functional/local-overlay-store/check-post-init-inner.sh rename to src/nix-functional-tests/local-overlay-store/check-post-init-inner.sh diff --git a/tests/functional/local-overlay-store/check-post-init.sh b/src/nix-functional-tests/local-overlay-store/check-post-init.sh similarity index 100% rename from tests/functional/local-overlay-store/check-post-init.sh rename to src/nix-functional-tests/local-overlay-store/check-post-init.sh diff --git a/tests/functional/local-overlay-store/common.sh b/src/nix-functional-tests/local-overlay-store/common.sh similarity index 100% rename from tests/functional/local-overlay-store/common.sh rename to src/nix-functional-tests/local-overlay-store/common.sh diff --git a/tests/functional/local-overlay-store/delete-duplicate-inner.sh b/src/nix-functional-tests/local-overlay-store/delete-duplicate-inner.sh similarity index 100% rename from tests/functional/local-overlay-store/delete-duplicate-inner.sh rename to src/nix-functional-tests/local-overlay-store/delete-duplicate-inner.sh diff --git a/tests/functional/local-overlay-store/delete-duplicate.sh b/src/nix-functional-tests/local-overlay-store/delete-duplicate.sh similarity index 100% rename from tests/functional/local-overlay-store/delete-duplicate.sh rename to src/nix-functional-tests/local-overlay-store/delete-duplicate.sh diff --git a/tests/functional/local-overlay-store/delete-refs-inner.sh b/src/nix-functional-tests/local-overlay-store/delete-refs-inner.sh similarity index 100% rename from tests/functional/local-overlay-store/delete-refs-inner.sh rename to src/nix-functional-tests/local-overlay-store/delete-refs-inner.sh diff --git a/tests/functional/local-overlay-store/delete-refs.sh b/src/nix-functional-tests/local-overlay-store/delete-refs.sh similarity index 100% rename from tests/functional/local-overlay-store/delete-refs.sh rename to src/nix-functional-tests/local-overlay-store/delete-refs.sh diff --git a/tests/functional/local-overlay-store/gc-inner.sh b/src/nix-functional-tests/local-overlay-store/gc-inner.sh similarity index 100% rename from tests/functional/local-overlay-store/gc-inner.sh rename to src/nix-functional-tests/local-overlay-store/gc-inner.sh diff --git a/tests/functional/local-overlay-store/gc.sh b/src/nix-functional-tests/local-overlay-store/gc.sh similarity index 100% rename from tests/functional/local-overlay-store/gc.sh rename to src/nix-functional-tests/local-overlay-store/gc.sh diff --git a/tests/functional/local-overlay-store/local.mk b/src/nix-functional-tests/local-overlay-store/local.mk similarity index 100% rename from tests/functional/local-overlay-store/local.mk rename to src/nix-functional-tests/local-overlay-store/local.mk diff --git a/tests/functional/local-overlay-store/meson.build b/src/nix-functional-tests/local-overlay-store/meson.build similarity index 100% rename from tests/functional/local-overlay-store/meson.build rename to src/nix-functional-tests/local-overlay-store/meson.build diff --git a/tests/functional/local-overlay-store/optimise-inner.sh b/src/nix-functional-tests/local-overlay-store/optimise-inner.sh similarity index 100% rename from tests/functional/local-overlay-store/optimise-inner.sh rename to src/nix-functional-tests/local-overlay-store/optimise-inner.sh diff --git a/tests/functional/local-overlay-store/optimise.sh b/src/nix-functional-tests/local-overlay-store/optimise.sh similarity index 100% rename from tests/functional/local-overlay-store/optimise.sh rename to src/nix-functional-tests/local-overlay-store/optimise.sh diff --git a/tests/functional/local-overlay-store/redundant-add-inner.sh b/src/nix-functional-tests/local-overlay-store/redundant-add-inner.sh similarity index 100% rename from tests/functional/local-overlay-store/redundant-add-inner.sh rename to src/nix-functional-tests/local-overlay-store/redundant-add-inner.sh diff --git a/tests/functional/local-overlay-store/redundant-add.sh b/src/nix-functional-tests/local-overlay-store/redundant-add.sh similarity index 100% rename from tests/functional/local-overlay-store/redundant-add.sh rename to src/nix-functional-tests/local-overlay-store/redundant-add.sh diff --git a/tests/functional/local-overlay-store/remount.sh b/src/nix-functional-tests/local-overlay-store/remount.sh similarity index 100% rename from tests/functional/local-overlay-store/remount.sh rename to src/nix-functional-tests/local-overlay-store/remount.sh diff --git a/tests/functional/local-overlay-store/stale-file-handle-inner.sh b/src/nix-functional-tests/local-overlay-store/stale-file-handle-inner.sh similarity index 100% rename from tests/functional/local-overlay-store/stale-file-handle-inner.sh rename to src/nix-functional-tests/local-overlay-store/stale-file-handle-inner.sh diff --git a/tests/functional/local-overlay-store/stale-file-handle.sh b/src/nix-functional-tests/local-overlay-store/stale-file-handle.sh similarity index 100% rename from tests/functional/local-overlay-store/stale-file-handle.sh rename to src/nix-functional-tests/local-overlay-store/stale-file-handle.sh diff --git a/tests/functional/local-overlay-store/verify-inner.sh b/src/nix-functional-tests/local-overlay-store/verify-inner.sh similarity index 100% rename from tests/functional/local-overlay-store/verify-inner.sh rename to src/nix-functional-tests/local-overlay-store/verify-inner.sh diff --git a/tests/functional/local-overlay-store/verify.sh b/src/nix-functional-tests/local-overlay-store/verify.sh similarity index 100% rename from tests/functional/local-overlay-store/verify.sh rename to src/nix-functional-tests/local-overlay-store/verify.sh diff --git a/tests/functional/local.mk b/src/nix-functional-tests/local.mk similarity index 100% rename from tests/functional/local.mk rename to src/nix-functional-tests/local.mk diff --git a/tests/functional/logging.sh b/src/nix-functional-tests/logging.sh similarity index 100% rename from tests/functional/logging.sh rename to src/nix-functional-tests/logging.sh diff --git a/tests/functional/meson.build b/src/nix-functional-tests/meson.build similarity index 98% rename from tests/functional/meson.build rename to src/nix-functional-tests/meson.build index 54f3e7a0158..ab3c938d6f1 100644 --- a/tests/functional/meson.build +++ b/src/nix-functional-tests/meson.build @@ -233,7 +233,7 @@ foreach suite : suites prefix = fs.relative_to(workdir, meson.project_build_root()) script = script - # Turns, e.g., `tests/functional/flakes/show.sh` into a Meson test target called + # Turns, e.g., `src/nix-functional-tests/flakes/show.sh` into a Meson test target called # `functional-flakes-show`. name = fs.replace_suffix(prefix / script, '') diff --git a/tests/functional/misc.sh b/src/nix-functional-tests/misc.sh similarity index 100% rename from tests/functional/misc.sh rename to src/nix-functional-tests/misc.sh diff --git a/tests/functional/multiple-outputs.nix b/src/nix-functional-tests/multiple-outputs.nix similarity index 100% rename from tests/functional/multiple-outputs.nix rename to src/nix-functional-tests/multiple-outputs.nix diff --git a/tests/functional/multiple-outputs.sh b/src/nix-functional-tests/multiple-outputs.sh similarity index 100% rename from tests/functional/multiple-outputs.sh rename to src/nix-functional-tests/multiple-outputs.sh diff --git a/tests/functional/name-after-node.nar b/src/nix-functional-tests/name-after-node.nar similarity index 100% rename from tests/functional/name-after-node.nar rename to src/nix-functional-tests/name-after-node.nar diff --git a/tests/functional/nar-access.nix b/src/nix-functional-tests/nar-access.nix similarity index 100% rename from tests/functional/nar-access.nix rename to src/nix-functional-tests/nar-access.nix diff --git a/tests/functional/nar-access.sh b/src/nix-functional-tests/nar-access.sh similarity index 100% rename from tests/functional/nar-access.sh rename to src/nix-functional-tests/nar-access.sh diff --git a/tests/functional/nars.sh b/src/nix-functional-tests/nars.sh similarity index 100% rename from tests/functional/nars.sh rename to src/nix-functional-tests/nars.sh diff --git a/tests/functional/nested-sandboxing.sh b/src/nix-functional-tests/nested-sandboxing.sh similarity index 76% rename from tests/functional/nested-sandboxing.sh rename to src/nix-functional-tests/nested-sandboxing.sh index ae0256de2d6..17e3ecf3e07 100755 --- a/tests/functional/nested-sandboxing.sh +++ b/src/nix-functional-tests/nested-sandboxing.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash source common.sh -# This test is run by `tests/functional/nested-sandboxing/runner.nix` in an extra layer of sandboxing. +# This test is run by `src/nix-functional-tests/nested-sandboxing/runner.nix` in an extra layer of sandboxing. [[ -d /nix/store ]] || skipTest "running this test without Nix's deps being drawn from /nix/store is not yet supported" TODO_NixOS diff --git a/tests/functional/nested-sandboxing/command.sh b/src/nix-functional-tests/nested-sandboxing/command.sh similarity index 100% rename from tests/functional/nested-sandboxing/command.sh rename to src/nix-functional-tests/nested-sandboxing/command.sh diff --git a/tests/functional/nested-sandboxing/runner.nix b/src/nix-functional-tests/nested-sandboxing/runner.nix similarity index 100% rename from tests/functional/nested-sandboxing/runner.nix rename to src/nix-functional-tests/nested-sandboxing/runner.nix diff --git a/tests/functional/nix-build-examples.nix b/src/nix-functional-tests/nix-build-examples.nix similarity index 100% rename from tests/functional/nix-build-examples.nix rename to src/nix-functional-tests/nix-build-examples.nix diff --git a/tests/functional/nix-build.sh b/src/nix-functional-tests/nix-build.sh similarity index 100% rename from tests/functional/nix-build.sh rename to src/nix-functional-tests/nix-build.sh diff --git a/tests/functional/nix-channel.sh b/src/nix-functional-tests/nix-channel.sh similarity index 100% rename from tests/functional/nix-channel.sh rename to src/nix-functional-tests/nix-channel.sh diff --git a/tests/functional/nix-collect-garbage-d.sh b/src/nix-functional-tests/nix-collect-garbage-d.sh similarity index 100% rename from tests/functional/nix-collect-garbage-d.sh rename to src/nix-functional-tests/nix-collect-garbage-d.sh diff --git a/tests/functional/nix-copy-ssh-common.sh b/src/nix-functional-tests/nix-copy-ssh-common.sh similarity index 100% rename from tests/functional/nix-copy-ssh-common.sh rename to src/nix-functional-tests/nix-copy-ssh-common.sh diff --git a/tests/functional/nix-copy-ssh-ng.sh b/src/nix-functional-tests/nix-copy-ssh-ng.sh similarity index 100% rename from tests/functional/nix-copy-ssh-ng.sh rename to src/nix-functional-tests/nix-copy-ssh-ng.sh diff --git a/tests/functional/nix-copy-ssh.sh b/src/nix-functional-tests/nix-copy-ssh.sh similarity index 100% rename from tests/functional/nix-copy-ssh.sh rename to src/nix-functional-tests/nix-copy-ssh.sh diff --git a/tests/functional/nix-daemon-untrusting.sh b/src/nix-functional-tests/nix-daemon-untrusting.sh similarity index 100% rename from tests/functional/nix-daemon-untrusting.sh rename to src/nix-functional-tests/nix-daemon-untrusting.sh diff --git a/tests/functional/nix-profile.sh b/src/nix-functional-tests/nix-profile.sh similarity index 100% rename from tests/functional/nix-profile.sh rename to src/nix-functional-tests/nix-profile.sh diff --git a/tests/functional/nix-shell.sh b/src/nix-functional-tests/nix-shell.sh similarity index 100% rename from tests/functional/nix-shell.sh rename to src/nix-functional-tests/nix-shell.sh diff --git a/tests/functional/nix_path.sh b/src/nix-functional-tests/nix_path.sh similarity index 100% rename from tests/functional/nix_path.sh rename to src/nix-functional-tests/nix_path.sh diff --git a/tests/functional/nul.nar b/src/nix-functional-tests/nul.nar similarity index 100% rename from tests/functional/nul.nar rename to src/nix-functional-tests/nul.nar diff --git a/tests/functional/optimise-store.sh b/src/nix-functional-tests/optimise-store.sh similarity index 100% rename from tests/functional/optimise-store.sh rename to src/nix-functional-tests/optimise-store.sh diff --git a/tests/functional/output-normalization.sh b/src/nix-functional-tests/output-normalization.sh similarity index 100% rename from tests/functional/output-normalization.sh rename to src/nix-functional-tests/output-normalization.sh diff --git a/tests/functional/package.nix b/src/nix-functional-tests/package.nix similarity index 96% rename from tests/functional/package.nix rename to src/nix-functional-tests/package.nix index 21be38c543e..3d1a2d010a1 100644 --- a/tests/functional/package.nix +++ b/src/nix-functional-tests/package.nix @@ -43,7 +43,6 @@ mkMesonDerivation (finalAttrs: { fileset = fileset.unions [ ../../scripts/nix-profile.sh.in ../../.version - ../../tests/functional ./. ]; @@ -87,7 +86,7 @@ mkMesonDerivation (finalAttrs: { # not the actual directory directory. + '' cd $(readlink -e $PWD) - echo $PWD | grep tests/functional + echo $PWD | grep src/nix-functional-tests ''; mesonCheckFlags = [ diff --git a/tests/functional/parallel.builder.sh b/src/nix-functional-tests/parallel.builder.sh similarity index 100% rename from tests/functional/parallel.builder.sh rename to src/nix-functional-tests/parallel.builder.sh diff --git a/tests/functional/parallel.nix b/src/nix-functional-tests/parallel.nix similarity index 100% rename from tests/functional/parallel.nix rename to src/nix-functional-tests/parallel.nix diff --git a/tests/functional/parallel.sh b/src/nix-functional-tests/parallel.sh similarity index 100% rename from tests/functional/parallel.sh rename to src/nix-functional-tests/parallel.sh diff --git a/tests/functional/pass-as-file.sh b/src/nix-functional-tests/pass-as-file.sh similarity index 100% rename from tests/functional/pass-as-file.sh rename to src/nix-functional-tests/pass-as-file.sh diff --git a/tests/functional/path-from-hash-part.sh b/src/nix-functional-tests/path-from-hash-part.sh similarity index 100% rename from tests/functional/path-from-hash-part.sh rename to src/nix-functional-tests/path-from-hash-part.sh diff --git a/tests/functional/path-info.sh b/src/nix-functional-tests/path-info.sh similarity index 100% rename from tests/functional/path-info.sh rename to src/nix-functional-tests/path-info.sh diff --git a/tests/functional/path.nix b/src/nix-functional-tests/path.nix similarity index 100% rename from tests/functional/path.nix rename to src/nix-functional-tests/path.nix diff --git a/tests/functional/placeholders.sh b/src/nix-functional-tests/placeholders.sh similarity index 100% rename from tests/functional/placeholders.sh rename to src/nix-functional-tests/placeholders.sh diff --git a/tests/functional/plugins.sh b/src/nix-functional-tests/plugins.sh similarity index 100% rename from tests/functional/plugins.sh rename to src/nix-functional-tests/plugins.sh diff --git a/tests/functional/plugins/local.mk b/src/nix-functional-tests/plugins/local.mk similarity index 100% rename from tests/functional/plugins/local.mk rename to src/nix-functional-tests/plugins/local.mk diff --git a/tests/functional/plugins/meson.build b/src/nix-functional-tests/plugins/meson.build similarity index 100% rename from tests/functional/plugins/meson.build rename to src/nix-functional-tests/plugins/meson.build diff --git a/tests/functional/plugins/plugintest.cc b/src/nix-functional-tests/plugins/plugintest.cc similarity index 100% rename from tests/functional/plugins/plugintest.cc rename to src/nix-functional-tests/plugins/plugintest.cc diff --git a/tests/functional/post-hook.sh b/src/nix-functional-tests/post-hook.sh similarity index 100% rename from tests/functional/post-hook.sh rename to src/nix-functional-tests/post-hook.sh diff --git a/tests/functional/pure-eval.nix b/src/nix-functional-tests/pure-eval.nix similarity index 100% rename from tests/functional/pure-eval.nix rename to src/nix-functional-tests/pure-eval.nix diff --git a/tests/functional/pure-eval.sh b/src/nix-functional-tests/pure-eval.sh similarity index 100% rename from tests/functional/pure-eval.sh rename to src/nix-functional-tests/pure-eval.sh diff --git a/tests/functional/push-to-store-old.sh b/src/nix-functional-tests/push-to-store-old.sh similarity index 100% rename from tests/functional/push-to-store-old.sh rename to src/nix-functional-tests/push-to-store-old.sh diff --git a/tests/functional/push-to-store.sh b/src/nix-functional-tests/push-to-store.sh similarity index 100% rename from tests/functional/push-to-store.sh rename to src/nix-functional-tests/push-to-store.sh diff --git a/tests/functional/read-only-store.sh b/src/nix-functional-tests/read-only-store.sh similarity index 100% rename from tests/functional/read-only-store.sh rename to src/nix-functional-tests/read-only-store.sh diff --git a/tests/functional/readfile-context.nix b/src/nix-functional-tests/readfile-context.nix similarity index 100% rename from tests/functional/readfile-context.nix rename to src/nix-functional-tests/readfile-context.nix diff --git a/tests/functional/readfile-context.sh b/src/nix-functional-tests/readfile-context.sh similarity index 100% rename from tests/functional/readfile-context.sh rename to src/nix-functional-tests/readfile-context.sh diff --git a/tests/functional/recursive.nix b/src/nix-functional-tests/recursive.nix similarity index 100% rename from tests/functional/recursive.nix rename to src/nix-functional-tests/recursive.nix diff --git a/tests/functional/recursive.sh b/src/nix-functional-tests/recursive.sh similarity index 100% rename from tests/functional/recursive.sh rename to src/nix-functional-tests/recursive.sh diff --git a/tests/functional/referrers.sh b/src/nix-functional-tests/referrers.sh similarity index 100% rename from tests/functional/referrers.sh rename to src/nix-functional-tests/referrers.sh diff --git a/tests/functional/remote-store.sh b/src/nix-functional-tests/remote-store.sh similarity index 100% rename from tests/functional/remote-store.sh rename to src/nix-functional-tests/remote-store.sh diff --git a/tests/functional/repair.sh b/src/nix-functional-tests/repair.sh similarity index 100% rename from tests/functional/repair.sh rename to src/nix-functional-tests/repair.sh diff --git a/tests/functional/repl.sh b/src/nix-functional-tests/repl.sh similarity index 98% rename from tests/functional/repl.sh rename to src/nix-functional-tests/repl.sh index 706e0f5dba9..34ab1a23cc2 100755 --- a/tests/functional/repl.sh +++ b/src/nix-functional-tests/repl.sh @@ -298,8 +298,8 @@ runRepl () { | stripEmptyLinesBeforePrompt \ | stripFinalPrompt \ | sed \ - -e "s@$testDir@/path/to/tests/functional@g" \ - -e "s@$testDirNoUnderscores@/path/to/tests/functional@g" \ + -e "s@$testDir@/path/to/src/nix-functional-tests@g" \ + -e "s@$testDirNoUnderscores@/path/to/src/nix-functional-tests@g" \ -e "s@$nixVersion@@g" \ -e "s@Added [0-9]* variables@Added variables@g" \ | grep -vF $'warning: you don\'t have Internet access; disabling some network-dependent features' \ diff --git a/tests/functional/repl/characterisation/empty b/src/nix-functional-tests/repl/characterisation/empty similarity index 100% rename from tests/functional/repl/characterisation/empty rename to src/nix-functional-tests/repl/characterisation/empty diff --git a/tests/functional/repl/doc-comment-curried-args.expected b/src/nix-functional-tests/repl/doc-comment-curried-args.expected similarity index 80% rename from tests/functional/repl/doc-comment-curried-args.expected rename to src/nix-functional-tests/repl/doc-comment-curried-args.expected index 56607e911e8..94b029cabbf 100644 --- a/tests/functional/repl/doc-comment-curried-args.expected +++ b/src/nix-functional-tests/repl/doc-comment-curried-args.expected @@ -6,7 +6,7 @@ Added variables. nix-repl> :doc curriedArgs Function `curriedArgs`\ - … defined at /path/to/tests/functional/repl/doc-comments.nix:48:5 + … defined at /path/to/src/nix-functional-tests/repl/doc-comments.nix:48:5 A documented function. @@ -17,7 +17,7 @@ nix-repl> "Note that users may not expect this to behave as it currently does" nix-repl> :doc x Function `curriedArgs`\ - … defined at /path/to/tests/functional/repl/doc-comments.nix:50:5 + … defined at /path/to/src/nix-functional-tests/repl/doc-comments.nix:50:5 The function returned by applying once diff --git a/tests/functional/repl/doc-comment-curried-args.in b/src/nix-functional-tests/repl/doc-comment-curried-args.in similarity index 100% rename from tests/functional/repl/doc-comment-curried-args.in rename to src/nix-functional-tests/repl/doc-comment-curried-args.in diff --git a/tests/functional/repl/doc-comment-formals.expected b/src/nix-functional-tests/repl/doc-comment-formals.expected similarity index 76% rename from tests/functional/repl/doc-comment-formals.expected rename to src/nix-functional-tests/repl/doc-comment-formals.expected index 1024919f4b9..56a29495e10 100644 --- a/tests/functional/repl/doc-comment-formals.expected +++ b/src/nix-functional-tests/repl/doc-comment-formals.expected @@ -9,6 +9,6 @@ nix-repl> "Note that this is not yet complete" nix-repl> :doc documentedFormals Function `documentedFormals`\ - … defined at /path/to/tests/functional/repl/doc-comments.nix:57:5 + … defined at /path/to/src/nix-functional-tests/repl/doc-comments.nix:57:5 Finds x diff --git a/tests/functional/repl/doc-comment-formals.in b/src/nix-functional-tests/repl/doc-comment-formals.in similarity index 100% rename from tests/functional/repl/doc-comment-formals.in rename to src/nix-functional-tests/repl/doc-comment-formals.in diff --git a/tests/functional/repl/doc-comment-function.expected b/src/nix-functional-tests/repl/doc-comment-function.expected similarity index 61% rename from tests/functional/repl/doc-comment-function.expected rename to src/nix-functional-tests/repl/doc-comment-function.expected index 3889c4f7860..0793bb8df7d 100644 --- a/tests/functional/repl/doc-comment-function.expected +++ b/src/nix-functional-tests/repl/doc-comment-function.expected @@ -2,6 +2,6 @@ Nix Type :? for help. nix-repl> :doc import ./doc-comment-function.nix -Function defined at /path/to/tests/functional/repl/doc-comment-function.nix:2:1 +Function defined at /path/to/src/nix-functional-tests/repl/doc-comment-function.nix:2:1 A doc comment for a file that only contains a function diff --git a/tests/functional/repl/doc-comment-function.in b/src/nix-functional-tests/repl/doc-comment-function.in similarity index 100% rename from tests/functional/repl/doc-comment-function.in rename to src/nix-functional-tests/repl/doc-comment-function.in diff --git a/tests/functional/repl/doc-comment-function.nix b/src/nix-functional-tests/repl/doc-comment-function.nix similarity index 100% rename from tests/functional/repl/doc-comment-function.nix rename to src/nix-functional-tests/repl/doc-comment-function.nix diff --git a/tests/functional/repl/doc-comments.nix b/src/nix-functional-tests/repl/doc-comments.nix similarity index 100% rename from tests/functional/repl/doc-comments.nix rename to src/nix-functional-tests/repl/doc-comments.nix diff --git a/tests/functional/repl/doc-compact.expected b/src/nix-functional-tests/repl/doc-compact.expected similarity index 65% rename from tests/functional/repl/doc-compact.expected rename to src/nix-functional-tests/repl/doc-compact.expected index 79f1fd44f59..4bdd28bc498 100644 --- a/tests/functional/repl/doc-compact.expected +++ b/src/nix-functional-tests/repl/doc-compact.expected @@ -6,6 +6,6 @@ Added variables. nix-repl> :doc compact Function `compact`\ - … defined at /path/to/tests/functional/repl/doc-comments.nix:18:20 + … defined at /path/to/src/nix-functional-tests/repl/doc-comments.nix:18:20 boom diff --git a/tests/functional/repl/doc-compact.in b/src/nix-functional-tests/repl/doc-compact.in similarity index 100% rename from tests/functional/repl/doc-compact.in rename to src/nix-functional-tests/repl/doc-compact.in diff --git a/tests/functional/repl/doc-constant.expected b/src/nix-functional-tests/repl/doc-constant.expected similarity index 77% rename from tests/functional/repl/doc-constant.expected rename to src/nix-functional-tests/repl/doc-constant.expected index 5787e04dc19..fc79ac57ce1 100644 --- a/tests/functional/repl/doc-constant.expected +++ b/src/nix-functional-tests/repl/doc-constant.expected @@ -10,21 +10,21 @@ error: value does not have documentation nix-repl> :doc lib.version Attribute `version` - … defined at /path/to/tests/functional/repl/doc-comments.nix:30:3 + … defined at /path/to/src/nix-functional-tests/repl/doc-comments.nix:30:3 Immovably fixed. nix-repl> :doc lib.attr.empty Attribute `empty` - … defined at /path/to/tests/functional/repl/doc-comments.nix:33:3 + … defined at /path/to/src/nix-functional-tests/repl/doc-comments.nix:33:3 Unchangeably constant. nix-repl> :doc lib.attr.undocument error: … while evaluating the attribute 'attr.undocument' - at /path/to/tests/functional/repl/doc-comments.nix:33:3: + at /path/to/src/nix-functional-tests/repl/doc-comments.nix:33:3: 32| /** Unchangeably constant. */ 33| lib.attr.empty = { }; | ^ @@ -39,28 +39,28 @@ error: nix-repl> :doc (import ./doc-comments.nix).constant Attribute `constant` - … defined at /path/to/tests/functional/repl/doc-comments.nix:27:3 + … defined at /path/to/src/nix-functional-tests/repl/doc-comments.nix:27:3 Firmly rigid. nix-repl> :doc (import ./doc-comments.nix).lib.version Attribute `version` - … defined at /path/to/tests/functional/repl/doc-comments.nix:30:3 + … defined at /path/to/src/nix-functional-tests/repl/doc-comments.nix:30:3 Immovably fixed. nix-repl> :doc (import ./doc-comments.nix).lib.attr.empty Attribute `empty` - … defined at /path/to/tests/functional/repl/doc-comments.nix:33:3 + … defined at /path/to/src/nix-functional-tests/repl/doc-comments.nix:33:3 Unchangeably constant. nix-repl> :doc (import ./doc-comments.nix).lib.attr.undocumented Attribute `undocumented` - … defined at /path/to/tests/functional/repl/doc-comments.nix:35:3 + … defined at /path/to/src/nix-functional-tests/repl/doc-comments.nix:35:3 No documentation found. @@ -97,7 +97,7 @@ error: attribute 'missing' missing nix-repl> :doc lib.attr.undocumental error: … while evaluating the attribute 'attr.undocumental' - at /path/to/tests/functional/repl/doc-comments.nix:33:3: + at /path/to/src/nix-functional-tests/repl/doc-comments.nix:33:3: 32| /** Unchangeably constant. */ 33| lib.attr.empty = { }; | ^ diff --git a/tests/functional/repl/doc-constant.in b/src/nix-functional-tests/repl/doc-constant.in similarity index 100% rename from tests/functional/repl/doc-constant.in rename to src/nix-functional-tests/repl/doc-constant.in diff --git a/tests/functional/repl/doc-floatedIn.expected b/src/nix-functional-tests/repl/doc-floatedIn.expected similarity index 68% rename from tests/functional/repl/doc-floatedIn.expected rename to src/nix-functional-tests/repl/doc-floatedIn.expected index 82bb80b9501..24c6ea5a32a 100644 --- a/tests/functional/repl/doc-floatedIn.expected +++ b/src/nix-functional-tests/repl/doc-floatedIn.expected @@ -6,6 +6,6 @@ Added variables. nix-repl> :doc floatedIn Function `floatedIn`\ - … defined at /path/to/tests/functional/repl/doc-comments.nix:16:5 + … defined at /path/to/src/nix-functional-tests/repl/doc-comments.nix:16:5 This also works. diff --git a/tests/functional/repl/doc-floatedIn.in b/src/nix-functional-tests/repl/doc-floatedIn.in similarity index 100% rename from tests/functional/repl/doc-floatedIn.in rename to src/nix-functional-tests/repl/doc-floatedIn.in diff --git a/tests/functional/repl/doc-functor.expected b/src/nix-functional-tests/repl/doc-functor.expected similarity index 68% rename from tests/functional/repl/doc-functor.expected rename to src/nix-functional-tests/repl/doc-functor.expected index 8cb2706ef0f..704beaf29d1 100644 --- a/tests/functional/repl/doc-functor.expected +++ b/src/nix-functional-tests/repl/doc-functor.expected @@ -6,21 +6,21 @@ Added variables. nix-repl> :doc multiplier Function `__functor`\ - … defined at /path/to/tests/functional/repl/doc-functor.nix:12:23 + … defined at /path/to/src/nix-functional-tests/repl/doc-functor.nix:12:23 Multiply the argument by the factor stored in the factor attribute. nix-repl> :doc doubler Function `multiply`\ - … defined at /path/to/tests/functional/repl/doc-functor.nix:5:17 + … defined at /path/to/src/nix-functional-tests/repl/doc-functor.nix:5:17 Look, it's just like a function! nix-repl> :doc recursive Function `__functor`\ - … defined at /path/to/tests/functional/repl/doc-functor.nix:77:23 + … defined at /path/to/src/nix-functional-tests/repl/doc-functor.nix:77:23 This looks bad, but the docs are ok because of the eta expansion. @@ -30,14 +30,14 @@ error: … while partially calling '__functor' to retrieve documentation … while calling '__functor' - at /path/to/tests/functional/repl/doc-functor.nix:85:17: + at /path/to/src/nix-functional-tests/repl/doc-functor.nix:85:17: 84| */ 85| __functor = self: self.__functor self; | ^ 86| }; … from call site - at /path/to/tests/functional/repl/doc-functor.nix:85:23: + at /path/to/src/nix-functional-tests/repl/doc-functor.nix:85:23: 84| */ 85| __functor = self: self.__functor self; | ^ @@ -46,7 +46,7 @@ error: (19999 duplicate frames omitted) error: stack overflow; max-call-depth exceeded - at /path/to/tests/functional/repl/doc-functor.nix:85:23: + at /path/to/src/nix-functional-tests/repl/doc-functor.nix:85:23: 84| */ 85| __functor = self: self.__functor self; | ^ @@ -59,14 +59,14 @@ error: (10000 duplicate frames omitted) … while calling '__functor' - at /path/to/tests/functional/repl/doc-functor.nix:97:19: + at /path/to/src/nix-functional-tests/repl/doc-functor.nix:97:19: 96| f = x: { 97| __functor = self: (f (x + 1)); | ^ 98| }; error: stack overflow; max-call-depth exceeded - at /path/to/tests/functional/repl/doc-functor.nix:97:26: + at /path/to/src/nix-functional-tests/repl/doc-functor.nix:97:26: 96| f = x: { 97| __functor = self: (f (x + 1)); | ^ @@ -74,28 +74,28 @@ error: nix-repl> :doc helper Function `square`\ - … defined at /path/to/tests/functional/repl/doc-functor.nix:36:12 + … defined at /path/to/src/nix-functional-tests/repl/doc-functor.nix:36:12 Compute x^2 nix-repl> :doc helper2 Function `__functor`\ - … defined at /path/to/tests/functional/repl/doc-functor.nix:45:23 + … defined at /path/to/src/nix-functional-tests/repl/doc-functor.nix:45:23 This is a function that can be overridden. nix-repl> :doc lib.helper3 Function `__functor`\ - … defined at /path/to/tests/functional/repl/doc-functor.nix:45:23 + … defined at /path/to/src/nix-functional-tests/repl/doc-functor.nix:45:23 This is a function that can be overridden. nix-repl> :doc helper3 Function `__functor`\ - … defined at /path/to/tests/functional/repl/doc-functor.nix:45:23 + … defined at /path/to/src/nix-functional-tests/repl/doc-functor.nix:45:23 This is a function that can be overridden. diff --git a/tests/functional/repl/doc-functor.in b/src/nix-functional-tests/repl/doc-functor.in similarity index 100% rename from tests/functional/repl/doc-functor.in rename to src/nix-functional-tests/repl/doc-functor.in diff --git a/tests/functional/repl/doc-functor.nix b/src/nix-functional-tests/repl/doc-functor.nix similarity index 100% rename from tests/functional/repl/doc-functor.nix rename to src/nix-functional-tests/repl/doc-functor.nix diff --git a/tests/functional/repl/doc-lambda-flavors.expected b/src/nix-functional-tests/repl/doc-lambda-flavors.expected similarity index 58% rename from tests/functional/repl/doc-lambda-flavors.expected rename to src/nix-functional-tests/repl/doc-lambda-flavors.expected index ab5c956390f..e6d3a03503b 100644 --- a/tests/functional/repl/doc-lambda-flavors.expected +++ b/src/nix-functional-tests/repl/doc-lambda-flavors.expected @@ -6,24 +6,24 @@ Added variables. nix-repl> :doc nonStrict Function `nonStrict`\ - … defined at /path/to/tests/functional/repl/doc-comments.nix:37:70 + … defined at /path/to/src/nix-functional-tests/repl/doc-comments.nix:37:70 My syntax is not strict, but I'm strict anyway. nix-repl> :doc strict Function `strict`\ - … defined at /path/to/tests/functional/repl/doc-comments.nix:38:63 + … defined at /path/to/src/nix-functional-tests/repl/doc-comments.nix:38:63 I don't have to be strict, but I am anyway. nix-repl> :doc strictPre Function `strictPre`\ - … defined at /path/to/tests/functional/repl/doc-comments.nix:40:48 + … defined at /path/to/src/nix-functional-tests/repl/doc-comments.nix:40:48 Here's one way to do this nix-repl> :doc strictPost Function `strictPost`\ - … defined at /path/to/tests/functional/repl/doc-comments.nix:41:53 + … defined at /path/to/src/nix-functional-tests/repl/doc-comments.nix:41:53 Here's another way to do this diff --git a/tests/functional/repl/doc-lambda-flavors.in b/src/nix-functional-tests/repl/doc-lambda-flavors.in similarity index 100% rename from tests/functional/repl/doc-lambda-flavors.in rename to src/nix-functional-tests/repl/doc-lambda-flavors.in diff --git a/tests/functional/repl/doc-measurement.expected b/src/nix-functional-tests/repl/doc-measurement.expected similarity index 69% rename from tests/functional/repl/doc-measurement.expected rename to src/nix-functional-tests/repl/doc-measurement.expected index 555cac9a2a0..024251c69f4 100644 --- a/tests/functional/repl/doc-measurement.expected +++ b/src/nix-functional-tests/repl/doc-measurement.expected @@ -6,6 +6,6 @@ Added variables. nix-repl> :doc measurement Function `measurement`\ - … defined at /path/to/tests/functional/repl/doc-comments.nix:13:17 + … defined at /path/to/src/nix-functional-tests/repl/doc-comments.nix:13:17 👈 precisely this wide 👉 diff --git a/tests/functional/repl/doc-measurement.in b/src/nix-functional-tests/repl/doc-measurement.in similarity index 100% rename from tests/functional/repl/doc-measurement.in rename to src/nix-functional-tests/repl/doc-measurement.in diff --git a/tests/functional/repl/doc-multiply.expected b/src/nix-functional-tests/repl/doc-multiply.expected similarity index 77% rename from tests/functional/repl/doc-multiply.expected rename to src/nix-functional-tests/repl/doc-multiply.expected index 21523e24c81..c1245f1606d 100644 --- a/tests/functional/repl/doc-multiply.expected +++ b/src/nix-functional-tests/repl/doc-multiply.expected @@ -6,7 +6,7 @@ Added variables. nix-repl> :doc multiply Function `multiply`\ - … defined at /path/to/tests/functional/repl/doc-comments.nix:10:14 + … defined at /path/to/src/nix-functional-tests/repl/doc-comments.nix:10:14 Perform *arithmetic* multiplication. It's kind of like repeated **addition**, very neat. diff --git a/tests/functional/repl/doc-multiply.in b/src/nix-functional-tests/repl/doc-multiply.in similarity index 100% rename from tests/functional/repl/doc-multiply.in rename to src/nix-functional-tests/repl/doc-multiply.in diff --git a/tests/functional/repl/doc-unambiguous.expected b/src/nix-functional-tests/repl/doc-unambiguous.expected similarity index 67% rename from tests/functional/repl/doc-unambiguous.expected rename to src/nix-functional-tests/repl/doc-unambiguous.expected index 0db5505d781..5168470fe8a 100644 --- a/tests/functional/repl/doc-unambiguous.expected +++ b/src/nix-functional-tests/repl/doc-unambiguous.expected @@ -6,6 +6,6 @@ Added variables. nix-repl> :doc unambiguous Function `unambiguous`\ - … defined at /path/to/tests/functional/repl/doc-comments.nix:24:5 + … defined at /path/to/src/nix-functional-tests/repl/doc-comments.nix:24:5 Very close diff --git a/tests/functional/repl/doc-unambiguous.in b/src/nix-functional-tests/repl/doc-unambiguous.in similarity index 100% rename from tests/functional/repl/doc-unambiguous.in rename to src/nix-functional-tests/repl/doc-unambiguous.in diff --git a/tests/functional/repl/pretty-print-idempotent.expected b/src/nix-functional-tests/repl/pretty-print-idempotent.expected similarity index 100% rename from tests/functional/repl/pretty-print-idempotent.expected rename to src/nix-functional-tests/repl/pretty-print-idempotent.expected diff --git a/tests/functional/repl/pretty-print-idempotent.in b/src/nix-functional-tests/repl/pretty-print-idempotent.in similarity index 100% rename from tests/functional/repl/pretty-print-idempotent.in rename to src/nix-functional-tests/repl/pretty-print-idempotent.in diff --git a/tests/functional/repl/pretty-print-idempotent.nix b/src/nix-functional-tests/repl/pretty-print-idempotent.nix similarity index 100% rename from tests/functional/repl/pretty-print-idempotent.nix rename to src/nix-functional-tests/repl/pretty-print-idempotent.nix diff --git a/tests/functional/restricted.nix b/src/nix-functional-tests/restricted.nix similarity index 100% rename from tests/functional/restricted.nix rename to src/nix-functional-tests/restricted.nix diff --git a/tests/functional/restricted.sh b/src/nix-functional-tests/restricted.sh similarity index 100% rename from tests/functional/restricted.sh rename to src/nix-functional-tests/restricted.sh diff --git a/tests/functional/search.nix b/src/nix-functional-tests/search.nix similarity index 100% rename from tests/functional/search.nix rename to src/nix-functional-tests/search.nix diff --git a/tests/functional/search.sh b/src/nix-functional-tests/search.sh similarity index 100% rename from tests/functional/search.sh rename to src/nix-functional-tests/search.sh diff --git a/tests/functional/secure-drv-outputs.nix b/src/nix-functional-tests/secure-drv-outputs.nix similarity index 100% rename from tests/functional/secure-drv-outputs.nix rename to src/nix-functional-tests/secure-drv-outputs.nix diff --git a/tests/functional/secure-drv-outputs.sh b/src/nix-functional-tests/secure-drv-outputs.sh similarity index 100% rename from tests/functional/secure-drv-outputs.sh rename to src/nix-functional-tests/secure-drv-outputs.sh diff --git a/tests/functional/selfref-gc.sh b/src/nix-functional-tests/selfref-gc.sh similarity index 100% rename from tests/functional/selfref-gc.sh rename to src/nix-functional-tests/selfref-gc.sh diff --git a/tests/functional/shell-hello.nix b/src/nix-functional-tests/shell-hello.nix similarity index 100% rename from tests/functional/shell-hello.nix rename to src/nix-functional-tests/shell-hello.nix diff --git a/tests/functional/shell.nix b/src/nix-functional-tests/shell.nix similarity index 100% rename from tests/functional/shell.nix rename to src/nix-functional-tests/shell.nix diff --git a/tests/functional/shell.sh b/src/nix-functional-tests/shell.sh similarity index 100% rename from tests/functional/shell.sh rename to src/nix-functional-tests/shell.sh diff --git a/tests/functional/shell.shebang.expr b/src/nix-functional-tests/shell.shebang.expr similarity index 100% rename from tests/functional/shell.shebang.expr rename to src/nix-functional-tests/shell.shebang.expr diff --git a/tests/functional/shell.shebang.legacy.expr b/src/nix-functional-tests/shell.shebang.legacy.expr similarity index 100% rename from tests/functional/shell.shebang.legacy.expr rename to src/nix-functional-tests/shell.shebang.legacy.expr diff --git a/tests/functional/shell.shebang.nix b/src/nix-functional-tests/shell.shebang.nix similarity index 100% rename from tests/functional/shell.shebang.nix rename to src/nix-functional-tests/shell.shebang.nix diff --git a/tests/functional/shell.shebang.rb b/src/nix-functional-tests/shell.shebang.rb similarity index 100% rename from tests/functional/shell.shebang.rb rename to src/nix-functional-tests/shell.shebang.rb diff --git a/tests/functional/shell.shebang.sh b/src/nix-functional-tests/shell.shebang.sh similarity index 100% rename from tests/functional/shell.shebang.sh rename to src/nix-functional-tests/shell.shebang.sh diff --git a/tests/functional/signing.sh b/src/nix-functional-tests/signing.sh similarity index 100% rename from tests/functional/signing.sh rename to src/nix-functional-tests/signing.sh diff --git a/tests/functional/simple-failing.nix b/src/nix-functional-tests/simple-failing.nix similarity index 100% rename from tests/functional/simple-failing.nix rename to src/nix-functional-tests/simple-failing.nix diff --git a/tests/functional/simple.builder.sh b/src/nix-functional-tests/simple.builder.sh similarity index 100% rename from tests/functional/simple.builder.sh rename to src/nix-functional-tests/simple.builder.sh diff --git a/tests/functional/simple.nix b/src/nix-functional-tests/simple.nix similarity index 100% rename from tests/functional/simple.nix rename to src/nix-functional-tests/simple.nix diff --git a/tests/functional/simple.sh b/src/nix-functional-tests/simple.sh similarity index 100% rename from tests/functional/simple.sh rename to src/nix-functional-tests/simple.sh diff --git a/tests/functional/slash.nar b/src/nix-functional-tests/slash.nar similarity index 100% rename from tests/functional/slash.nar rename to src/nix-functional-tests/slash.nar diff --git a/tests/functional/ssh-relay.sh b/src/nix-functional-tests/ssh-relay.sh similarity index 100% rename from tests/functional/ssh-relay.sh rename to src/nix-functional-tests/ssh-relay.sh diff --git a/tests/functional/store-info.sh b/src/nix-functional-tests/store-info.sh similarity index 100% rename from tests/functional/store-info.sh rename to src/nix-functional-tests/store-info.sh diff --git a/tests/functional/structured-attrs-shell.nix b/src/nix-functional-tests/structured-attrs-shell.nix similarity index 100% rename from tests/functional/structured-attrs-shell.nix rename to src/nix-functional-tests/structured-attrs-shell.nix diff --git a/tests/functional/structured-attrs.nix b/src/nix-functional-tests/structured-attrs.nix similarity index 100% rename from tests/functional/structured-attrs.nix rename to src/nix-functional-tests/structured-attrs.nix diff --git a/tests/functional/structured-attrs.sh b/src/nix-functional-tests/structured-attrs.sh similarity index 100% rename from tests/functional/structured-attrs.sh rename to src/nix-functional-tests/structured-attrs.sh diff --git a/tests/functional/substitute-with-invalid-ca.sh b/src/nix-functional-tests/substitute-with-invalid-ca.sh similarity index 100% rename from tests/functional/substitute-with-invalid-ca.sh rename to src/nix-functional-tests/substitute-with-invalid-ca.sh diff --git a/tests/functional/suggestions.sh b/src/nix-functional-tests/suggestions.sh similarity index 100% rename from tests/functional/suggestions.sh rename to src/nix-functional-tests/suggestions.sh diff --git a/tests/functional/supplementary-groups.sh b/src/nix-functional-tests/supplementary-groups.sh similarity index 100% rename from tests/functional/supplementary-groups.sh rename to src/nix-functional-tests/supplementary-groups.sh diff --git a/tests/functional/symlink-derivation.nix b/src/nix-functional-tests/symlink-derivation.nix similarity index 100% rename from tests/functional/symlink-derivation.nix rename to src/nix-functional-tests/symlink-derivation.nix diff --git a/tests/functional/tarball.sh b/src/nix-functional-tests/tarball.sh similarity index 100% rename from tests/functional/tarball.sh rename to src/nix-functional-tests/tarball.sh diff --git a/tests/functional/test-infra.sh b/src/nix-functional-tests/test-infra.sh similarity index 100% rename from tests/functional/test-infra.sh rename to src/nix-functional-tests/test-infra.sh diff --git a/tests/functional/test-libstoreconsumer.sh b/src/nix-functional-tests/test-libstoreconsumer.sh similarity index 100% rename from tests/functional/test-libstoreconsumer.sh rename to src/nix-functional-tests/test-libstoreconsumer.sh diff --git a/tests/functional/test-libstoreconsumer/README.md b/src/nix-functional-tests/test-libstoreconsumer/README.md similarity index 100% rename from tests/functional/test-libstoreconsumer/README.md rename to src/nix-functional-tests/test-libstoreconsumer/README.md diff --git a/tests/functional/test-libstoreconsumer/local.mk b/src/nix-functional-tests/test-libstoreconsumer/local.mk similarity index 100% rename from tests/functional/test-libstoreconsumer/local.mk rename to src/nix-functional-tests/test-libstoreconsumer/local.mk diff --git a/tests/functional/test-libstoreconsumer/main.cc b/src/nix-functional-tests/test-libstoreconsumer/main.cc similarity index 100% rename from tests/functional/test-libstoreconsumer/main.cc rename to src/nix-functional-tests/test-libstoreconsumer/main.cc diff --git a/tests/functional/test-libstoreconsumer/meson.build b/src/nix-functional-tests/test-libstoreconsumer/meson.build similarity index 100% rename from tests/functional/test-libstoreconsumer/meson.build rename to src/nix-functional-tests/test-libstoreconsumer/meson.build diff --git a/tests/functional/timeout.nix b/src/nix-functional-tests/timeout.nix similarity index 100% rename from tests/functional/timeout.nix rename to src/nix-functional-tests/timeout.nix diff --git a/tests/functional/timeout.sh b/src/nix-functional-tests/timeout.sh similarity index 100% rename from tests/functional/timeout.sh rename to src/nix-functional-tests/timeout.sh diff --git a/tests/functional/toString-path.sh b/src/nix-functional-tests/toString-path.sh similarity index 100% rename from tests/functional/toString-path.sh rename to src/nix-functional-tests/toString-path.sh diff --git a/tests/functional/tree.tar.gz b/src/nix-functional-tests/tree.tar.gz similarity index 100% rename from tests/functional/tree.tar.gz rename to src/nix-functional-tests/tree.tar.gz diff --git a/tests/functional/undefined-variable.nix b/src/nix-functional-tests/undefined-variable.nix similarity index 100% rename from tests/functional/undefined-variable.nix rename to src/nix-functional-tests/undefined-variable.nix diff --git a/tests/functional/unnormalized.nar b/src/nix-functional-tests/unnormalized.nar similarity index 100% rename from tests/functional/unnormalized.nar rename to src/nix-functional-tests/unnormalized.nar diff --git a/tests/functional/user-envs-migration.sh b/src/nix-functional-tests/user-envs-migration.sh similarity index 100% rename from tests/functional/user-envs-migration.sh rename to src/nix-functional-tests/user-envs-migration.sh diff --git a/tests/functional/user-envs-test-case.sh b/src/nix-functional-tests/user-envs-test-case.sh similarity index 100% rename from tests/functional/user-envs-test-case.sh rename to src/nix-functional-tests/user-envs-test-case.sh diff --git a/tests/functional/user-envs.builder.sh b/src/nix-functional-tests/user-envs.builder.sh similarity index 100% rename from tests/functional/user-envs.builder.sh rename to src/nix-functional-tests/user-envs.builder.sh diff --git a/tests/functional/user-envs.nix b/src/nix-functional-tests/user-envs.nix similarity index 100% rename from tests/functional/user-envs.nix rename to src/nix-functional-tests/user-envs.nix diff --git a/tests/functional/user-envs.sh b/src/nix-functional-tests/user-envs.sh similarity index 100% rename from tests/functional/user-envs.sh rename to src/nix-functional-tests/user-envs.sh diff --git a/tests/functional/why-depends.sh b/src/nix-functional-tests/why-depends.sh similarity index 100% rename from tests/functional/why-depends.sh rename to src/nix-functional-tests/why-depends.sh diff --git a/tests/functional/zstd.sh b/src/nix-functional-tests/zstd.sh similarity index 100% rename from tests/functional/zstd.sh rename to src/nix-functional-tests/zstd.sh diff --git a/src/nix-store-tests/package.nix b/src/nix-store-tests/package.nix index 8319488d163..d31ad773dc4 100644 --- a/src/nix-store-tests/package.nix +++ b/src/nix-store-tests/package.nix @@ -71,7 +71,7 @@ mkMesonExecutable (finalAttrs: { root = ../..; fileset = lib.fileset.unions [ ./data - ../../tests/functional/derivation + ../nix-functional-tests/derivation ]; }; in runCommand "${finalAttrs.pname}-run" { diff --git a/tests/nixos/functional/common.nix b/tests/nixos/functional/common.nix index 51fd768843a..f1a977943dd 100644 --- a/tests/nixos/functional/common.nix +++ b/tests/nixos/functional/common.nix @@ -49,8 +49,8 @@ in cd nix # Tests we don't need - echo >tests/functional/plugins/local.mk - sed -i tests/functional/local.mk \ + echo >src/nix-functional-tests/plugins/local.mk + sed -i src/nix-functional-tests/local.mk \ -e 's!nix_tests += plugins\.sh!!' \ -e 's!nix_tests += test-libstoreconsumer\.sh!!' \ ; diff --git a/tests/repl-completion.nix b/tests/repl-completion.nix index 3ba198a9860..0950c268b2c 100644 --- a/tests/repl-completion.nix +++ b/tests/repl-completion.nix @@ -1,7 +1,7 @@ { runCommand, nix, expect }: # We only use expect when necessary, e.g. for testing tab completion in nix repl. -# See also tests/functional/repl.sh +# See also src/nix-functional-tests/repl.sh runCommand "repl-completion" { nativeBuildInputs = [